Tim Murray
adef754b45
am 25a1b489: am 4a1f02ea: Merge "Add foreground/boost cpuset." into mnc-dr-dev
...
* commit '25a1b4894d9fc249535f0e0b3851643eb172202f':
Add foreground/boost cpuset.
2015-09-03 04:22:24 +00:00
Tim Murray
bc8c731aab
Add zygote to the foreground cpuset.
...
This ensures that newly forked zygote processes will end up
in the corret cpuset.
bug 23751126
Change-Id: I987a2828cf2504963f1317d17f0b51d26cf22a70
2015-09-02 11:39:05 -07:00
Badhri Jagan Sridharan
e18018639b
init: usb: Add init scripts for configfs commands
...
This CL adds a new init script init.usb.configfs.rc
to add generic configfs commands. Setting
sys.usb.configfs in init.usb.{hardware}.rc
enables executing commands in this script
Bug=23633457
Change-Id: Iaae844a7957d6c9bf510648aaff86d56aa0c6243
2015-09-01 15:39:22 -07:00
Badhri Jagan Sridharan
48d59acc57
init.usb.rc: Add new system property for configfs
...
This CL helps to execute a different set of
commands for the usb configs specified in
init.usb.rc. Aimed at using configfs based
commands over android composition driver.
Bug=23633457
Change-Id: Ifa5f804e1cff93d15ad57d0ed553300bc5868936
2015-09-01 15:39:22 -07:00
Tim Murray
3985dda1c3
Add foreground/boost cpuset.
...
This is used for app launches (and maybe other high priority tasks
in the future). It's to be set to whatever cores should be used
for short term high-priority tasks.
bug 21915482
Change-Id: Id0ab0499146c09e860b97f4cb8095834cb12dd50
2015-08-25 00:31:54 -07:00
Tom Cherry
9f72700289
am 5ff07b26: am 9b2bc347: am 77d634f7: Merge "remove TARGET_PROVIDES_INIT_RC"
...
* commit '5ff07b26851f5f416844e767645876f9f6e11e23':
remove TARGET_PROVIDES_INIT_RC
2015-08-25 00:46:43 +00:00
Tom Cherry
5ff07b2685
am 9b2bc347: am 77d634f7: Merge "remove TARGET_PROVIDES_INIT_RC"
...
* commit '9b2bc347659de454796acfc9402cbbc170efd133':
remove TARGET_PROVIDES_INIT_RC
2015-08-24 23:35:28 +00:00
Tom Cherry
fbe3fa84ff
am 9b2bc347: am 77d634f7: Merge "remove TARGET_PROVIDES_INIT_RC"
...
* commit '9b2bc347659de454796acfc9402cbbc170efd133':
remove TARGET_PROVIDES_INIT_RC
2015-08-24 23:35:20 +00:00
Tom Cherry
0ea4ffdc06
remove TARGET_PROVIDES_INIT_RC
...
Change-Id: I15105a8dc11e218d95d4f5a4cee5b2a166d3d639
2015-08-24 13:56:43 -07:00
Tom Cherry
ef6556b8f9
resolved conflicts for merge of 22bc242a to master
...
Change-Id: I80546955611db9d003466c78588e8a7316ca9a6d
2015-08-21 15:22:57 -07:00
Tom Cherry
57a082f4de
resolved conflicts for merge of b21de5f6 to mnc-dev-plus-aosp
...
Change-Id: Ia0c7f2e33e22b2419811f7e68da276e02e156d08
2015-08-21 15:12:28 -07:00
Tom Cherry
22bc242a5b
resolved conflicts for merge of b21de5f6 to mnc-dr-dev-plus-aosp
...
Change-Id: I13fd71d5af0b0a66d0c3e2f026581c60e9b95e8b
2015-08-21 15:09:30 -07:00
Tom Cherry
837135a64f
remove bundled services from rootdir/init.rc
...
Services definitions for core services are now bundled with the source
for the service itself in the form of <service name>.rc. These
individual .rc files are now located in /system/init/... and are
parsed when the system partition is mounted.
Bug: 23186545
Change-Id: Ia1b73af8d005633aa4252d603892064d7804163d
2015-08-21 10:14:44 -07:00
Tim Kilbourn
f1ed73fdf7
am bb41f7d6: am 94653364: Merge "Use init to write usb typec props" into mnc-dr-dev
...
* commit 'bb41f7d6ed03073ae9df41e3cc0edb80d89574b9':
Use init to write usb typec props
2015-08-19 02:20:38 +00:00
Tim Kilbourn
bb41f7d6ed
am 94653364: Merge "Use init to write usb typec props" into mnc-dr-dev
...
* commit '946533648c49f2700b6e0f73383699597649ee60':
Use init to write usb typec props
2015-08-19 01:41:40 +00:00
Tim Kilbourn
8c12fdf4ab
Use init to write usb typec props
...
The sysfs nodes are owned by root, so use init to write role changes.
Bug: 21615151
Change-Id: I39ad03a23af0be9ac859d4fb79a46edc27e30f4e
2015-08-17 14:56:57 -07:00
Evgenii Stepanov
3aa4f5314e
am 548f53d0: am 1ec3ba44: am 428f626d: Merge "Read global ASAN_OPTIONS from a file."
...
* commit '548f53d0666dc4fc850989c8af260888584e40d9':
Read global ASAN_OPTIONS from a file.
2015-08-17 16:24:26 +00:00
Evgenii Stepanov
6c74e54544
am 1ec3ba44: am 428f626d: Merge "Read global ASAN_OPTIONS from a file."
...
* commit '1ec3ba4471d5883742b2500ba53ed2272539e756':
Read global ASAN_OPTIONS from a file.
2015-08-17 01:15:19 +00:00
Evgenii Stepanov
548f53d066
am 1ec3ba44: am 428f626d: Merge "Read global ASAN_OPTIONS from a file."
...
* commit '1ec3ba4471d5883742b2500ba53ed2272539e756':
Read global ASAN_OPTIONS from a file.
2015-08-17 01:15:06 +00:00
Evgenii Stepanov
428f626d1b
Merge "Read global ASAN_OPTIONS from a file."
2015-08-16 18:42:38 +00:00
Riley Andrews
2decff086c
am 94ee212a: am bc2cdfa8: am b81c410a: Merge "Added file permissions for binder tracing"
...
* commit '94ee212af135a1e602c9dac73f22dc6807409370':
Added file permissions for binder tracing
2015-08-12 23:56:32 +00:00
Riley Andrews
19fe5c9442
am f63f3685: am 4a4dc5f3: am a3a193ff: Merge "Added shell permisisons for memreclaim tracing"
...
* commit 'f63f36859eecb3b5a2a43b6ae75fdbbb0f2bc039':
Added shell permisisons for memreclaim tracing
2015-08-12 23:56:08 +00:00
Riley Andrews
94ee212af1
am bc2cdfa8: am b81c410a: Merge "Added file permissions for binder tracing"
...
* commit 'bc2cdfa8a00980f4c38ebcd67bac888b355e3787':
Added file permissions for binder tracing
2015-08-12 23:43:38 +00:00
Riley Andrews
87ea6cfb62
am bc2cdfa8: am b81c410a: Merge "Added file permissions for binder tracing"
...
* commit 'bc2cdfa8a00980f4c38ebcd67bac888b355e3787':
Added file permissions for binder tracing
2015-08-12 23:43:02 +00:00
Riley Andrews
f63f36859e
am 4a4dc5f3: am a3a193ff: Merge "Added shell permisisons for memreclaim tracing"
...
* commit '4a4dc5f313953764079a4020a3791e36ec43ba0c':
Added shell permisisons for memreclaim tracing
2015-08-12 23:28:40 +00:00
Riley Andrews
c1490ad9a0
am 4a4dc5f3: am a3a193ff: Merge "Added shell permisisons for memreclaim tracing"
...
* commit '4a4dc5f313953764079a4020a3791e36ec43ba0c':
Added shell permisisons for memreclaim tracing
2015-08-12 23:26:34 +00:00
Scott Bauer
cd1d99e268
Added file permissions for binder tracing
2015-08-12 16:20:51 -07:00
Riley Andrews
a3a193ffd9
Merge "Added shell permisisons for memreclaim tracing"
2015-08-12 23:13:38 +00:00
Evgenii Stepanov
0d2dde57fe
Read global ASAN_OPTIONS from a file.
...
Instead of setting global ASAN_OPTIONS in immutable init.environ.rc,
load them from a file that can be changed later. The file has to be
on the /system partition to both be editable and available at the
early stages of boot.
Also add allocator_may_return_null=1 as that is closer to the
non-ASan allocator behavior.
Bug: 22846541
Change-Id: Ib0f41393c528f2e7cb398470e41f50abf5f4f455
2015-08-10 11:30:54 -07:00
Jeff Sharkey
063d4b07ab
am 94629bde: resolved conflicts for merge of 779a38a5 to mnc-dr-dev-plus-aosp
...
* commit '94629bdec34b253fa2e9cd9ec800715b3c3a4f7f':
Protect runtime storage mount points.
2015-08-06 21:31:13 +00:00
Jeff Sharkey
94629bdec3
resolved conflicts for merge of 779a38a5 to mnc-dr-dev-plus-aosp
...
Change-Id: Ieaa0dcd8e93fba3060e9a85f17b1f5eabc6b8c9e
2015-08-06 14:22:46 -07:00
Jeff Sharkey
fdf1487493
resolved conflicts for merge of b9f438ff to mnc-dev-plus-aosp
...
Change-Id: I7103bacb1b2d7dc29b4f8d9dddb2fec1feb869d3
2015-08-06 12:52:25 -07:00
Jeff Sharkey
779a38a5cd
am b9f438ff: Protect runtime storage mount points.
...
* commit 'b9f438ff841f87c8ffbca85b13a533718a18e15f':
Protect runtime storage mount points.
2015-08-06 19:35:56 +00:00
Jeff Sharkey
b9f438ff84
Protect runtime storage mount points.
...
We have a bunch of magic that mounts the correct view of storage
access based on the runtime permissions of an app, but we forgot to
protect the real underlying data sources; oops.
This series of changes just bumps the directory heirarchy one level
to give us /mnt/runtime which we can mask off as 0700 to prevent
people from jumping to the exposed internals.
Also add CTS tests to verify that we're protecting access to
internal mount points like this.
Bug: 22964288
Change-Id: I32068e63a3362b37e8ebca1418f900bb8537b498
2015-08-06 11:45:31 -07:00
Daniel Rosenberg
5fa4fbc53e
am 0dbbb935: am e20a4194: am 516d30d5: Merge "rootdir: Create symlinks in Android.mk"
...
* commit '0dbbb935f9e358d31e8f37b9928520ee926886b4':
rootdir: Create symlinks in Android.mk
2015-08-04 01:19:27 +00:00
Daniel Rosenberg
764b7f561b
am e20a4194: am 516d30d5: Merge "rootdir: Create symlinks in Android.mk"
...
* commit 'e20a4194b8faacc542aee519a62a01954376be60':
rootdir: Create symlinks in Android.mk
2015-08-04 01:13:15 +00:00
Daniel Rosenberg
0dbbb935f9
am e20a4194: am 516d30d5: Merge "rootdir: Create symlinks in Android.mk"
...
* commit 'e20a4194b8faacc542aee519a62a01954376be60':
rootdir: Create symlinks in Android.mk
2015-08-04 01:12:57 +00:00
Daniel Rosenberg
595003a3d0
rootdir: Create symlinks in Android.mk
...
system.img may contain the root directory as well. In that case, we
need to create some symlinks init.rc would during the build.
Change-Id: I4e7726f38c0f9cd9846c761fad1446738edb52c0
2015-08-04 00:51:19 +00:00
Yasuhiro Matsuda
91e1b0135d
resolved conflicts for merge of 70ab38a5 to master
...
Change-Id: I7092ecb87f4020add5fe8843f188955a5579c284
2015-07-30 19:07:23 +09:00
Yasuhiro Matsuda
70ab38a570
am 102ead3a: am b10e562b: Merge "Introduce a mechanism to trace boot sequence."
...
* commit '102ead3ae187a007b8a90b61ea243197927b6ae2':
Introduce a mechanism to trace boot sequence.
2015-07-30 08:05:46 +00:00
Yasuhiro Matsuda
6b802c4b95
am 102ead3a: am b10e562b: Merge "Introduce a mechanism to trace boot sequence."
...
* commit '102ead3ae187a007b8a90b61ea243197927b6ae2':
Introduce a mechanism to trace boot sequence.
2015-07-30 08:05:13 +00:00
Yasuhiro Matsuda
f93db4b827
Introduce a mechanism to trace boot sequence.
...
This CL adds a trigger and a service so that Systrace can be used
for tracing events during boot.
persist.debug.atrace.boottrace property is used for switching on
and off tracing during boot. /data/misc/boottrace/categories
file is used for specifying the categories to be traced.
These property and file are rewritten by Systrace when the newly
added option --boot is specified.
Here is an example of tracing events of am and wm catetories
during boot.
$ external/chromium-trace/systrace am wm --boot
This command will cause the device to reboot. Once the device has
booted up, the trace report is created by hitting Ctrl+C.
As written in readme.txt, this mechanism relies on persistent
property, so tracing events that are emitted before that are not
recorded. This is enough for tracing events after zygote is
launched though.
This only works on userdebug or eng build for security reason.
BUG: 21739901
Change-Id: I03f2963d77a678f47eab5e3e29fc7e91bc9ca3a4
2015-07-29 12:53:05 +09:00
Jeffrey Vander Stoep
3fe84e009e
am f05256b3: am 4b70dd4c: am 26f0f657: Merge "init.rc: add healthd to system group to allow write to /dev/cpuset" into mnc-dev
...
* commit 'f05256b32b815fc5d8be65e2fbc2e4a9f4da5ccd':
init.rc: add healthd to system group to allow write to /dev/cpuset
2015-07-28 21:38:13 +00:00
Jeffrey Vander Stoep
f05256b32b
am 4b70dd4c: am 26f0f657: Merge "init.rc: add healthd to system group to allow write to /dev/cpuset" into mnc-dev
...
* commit '4b70dd4c8f5c5c2baed8cb1f8436bf74971e20c6':
init.rc: add healthd to system group to allow write to /dev/cpuset
2015-07-28 21:12:51 +00:00
Jeffrey Vander Stoep
6beb774d5e
am 26f0f657: Merge "init.rc: add healthd to system group to allow write to /dev/cpuset" into mnc-dev
...
* commit '26f0f657ec027430bde7d2237890ba59b3fd174a':
init.rc: add healthd to system group to allow write to /dev/cpuset
2015-07-28 20:08:40 +00:00
Jeffrey Vander Stoep
4b70dd4c8f
am 26f0f657: Merge "init.rc: add healthd to system group to allow write to /dev/cpuset" into mnc-dev
...
* commit '26f0f657ec027430bde7d2237890ba59b3fd174a':
init.rc: add healthd to system group to allow write to /dev/cpuset
2015-07-28 20:07:55 +00:00
Jeffrey Vander Stoep
26f0f657ec
Merge "init.rc: add healthd to system group to allow write to /dev/cpuset" into mnc-dev
2015-07-28 19:54:40 +00:00
Jeff Vander Stoep
a30a8e02dd
init.rc: add healthd to system group to allow write to /dev/cpuset
...
Also add to root group to avoid introducting new bugs.
Bug: 22699101
Change-Id: I9da31e0cc955efd711df3f4c6b17e39d74c01549
2015-07-28 12:27:36 -07:00
Nick Kralevich
b4a5b3bac5
am b57ba047: am ba03cc95: am 5f3b05ad: Merge "init.rc: mkdir /data/anr 0775 system system"
...
* commit 'b57ba047805fd7a779927075be4581f03f3ad938':
init.rc: mkdir /data/anr 0775 system system
2015-07-27 19:00:59 +00:00
Nick Kralevich
b57ba04780
am ba03cc95: am 5f3b05ad: Merge "init.rc: mkdir /data/anr 0775 system system"
...
* commit 'ba03cc953ff9076d5b01748912b102db43911f7f':
init.rc: mkdir /data/anr 0775 system system
2015-07-27 18:50:31 +00:00