openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
21,612 Commits 2 Branches 1 Tag 197 MiB
Commit Graph

1156 Commits

Author SHA1 Message Date
Badhri Jagan Sridharan d8cf000d6c am b081b8cd: am ddc296e8: am e1801863: init: usb: Add init scripts for configfs commands 
* commit 'b081b8cdd17ef678fd84dccb9b5645bd72f26c5b':
  init: usb: Add init scripts for configfs commands
 2015-09-03 05:03:20 +00:00
Badhri Jagan Sridharan 5917b8a3bc am 1c791dfd: am 723b410f: am 48d59acc: init.usb.rc: Add new system property for configfs 
* commit '1c791dfd3d8e5df380068dda0982ddb9149dcbd9':
  init.usb.rc: Add new system property for configfs
 2015-09-03 05:03:19 +00:00
Tim Murray a89568c29e am adef754b: am 25a1b489: am 4a1f02ea: Merge "Add foreground/boost cpuset." into mnc-dr-dev 
* commit 'adef754b4548b391c6c2cac3065c91ccaa783a1b':
  Add foreground/boost cpuset.
 2015-09-03 05:03:17 +00:00
Badhri Jagan Sridharan b081b8cdd1 am ddc296e8: am e1801863: init: usb: Add init scripts for configfs commands 
* commit 'ddc296e841fa98bc89c0459d1dd3e438c790f15d':
  init: usb: Add init scripts for configfs commands
 2015-09-03 04:23:16 +00:00
Badhri Jagan Sridharan 1c791dfd3d am 723b410f: am 48d59acc: init.usb.rc: Add new system property for configfs 
* commit '723b410ff50920cea270b282c19edcfaf6f444e2':
  init.usb.rc: Add new system property for configfs
 2015-09-03 04:23:15 +00:00
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
Nick Kralevich 0f42f39371 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-26 06:16:06 +00:00
Nick Kralevich c2ea70ae6e init.rc: mkdir /data/anr 0775 system system 
Ensure that /data/anr always exists. This allows us to eliminate
some code in system_server and dumpstate. In addition, this change
solves a common problem where people would create the directory
manually but fail to set the SELinux label, which would cause
subsequent failures when they used the directory for ANRs.

Bug: 22385254
Change-Id: I29eb3deb21a0504aed07570fee3c2f87e41f53a0
 2015-07-25 21:06:20 -07:00
Jeff Vander Stoep 9752a4696e am 552f23de: am 1d0fe13a: am 3f62a020: logd: allow logd to write to /dev/cpuset files 
* commit '552f23deef9491f4e60b78f1ca6f89b7b60c5de2':
  logd: allow logd to write to /dev/cpuset files
 2015-07-25 17:00:47 +00:00
Jeff Vander Stoep 552f23deef am 1d0fe13a: am 3f62a020: logd: allow logd to write to /dev/cpuset files 
* commit '1d0fe13a9e720a88766b38070195670183274e30':
  logd: allow logd to write to /dev/cpuset files
 2015-07-25 16:38:32 +00:00
Jeff Vander Stoep 1d0fe13a9e am 3f62a020: logd: allow logd to write to /dev/cpuset files 
* commit '3f62a020c48d5d812fb2898759b93a59dc24d310':
  logd: allow logd to write to /dev/cpuset files
 2015-07-25 00:59:33 +00:00
Jeff Vander Stoep c200e9564b am 3f62a020: logd: allow logd to write to /dev/cpuset files 
* commit '3f62a020c48d5d812fb2898759b93a59dc24d310':
  logd: allow logd to write to /dev/cpuset files
 2015-07-24 23:31:53 +00:00
Jeff Vander Stoep 3f62a020c4 logd: allow logd to write to /dev/cpuset files 
Required by logd on devices with USE_CPUSETS defined.

Make /dev/cpuset/background, /dev/cpuset/foreground and
/dev/cpuset/task writeable by system gid. Add logd to system
group for writing to cpuset files and to root group to avoid
regressions. When dropping privs, also drop supplementary groups.

Bug: 22699101
Change-Id: Icc01769b18b5e1f1649623da8325a8bfabc3a3f0
 2015-07-24 16:22:06 +00:00
Riley Andrews 42525a1b24 am 7c1ae005: am e850f578: Disable scaling of the cfs tunables. 
* commit '7c1ae0051d8492b12862f0983521883a1325bdd3':
  Disable scaling of the cfs tunables.
 2015-07-21 21:44:03 +00:00
Riley Andrews 7c1ae0051d am e850f578: Disable scaling of the cfs tunables. 
* commit 'e850f5786cdd4d3e4f1157db8785de3e6ff77eab':
  Disable scaling of the cfs tunables.
 2015-07-21 21:15:37 +00:00
Riley Andrews e850f5786c Disable scaling of the cfs tunables. 
The cfs tunables auto-scale with the number of active cpus by default. Given
that the tunable settings are in device-independent code and it's not
known how many cores are currently active when the init.rc file runs,
the cfs tunables can vary pretty significantly across devices depending
on the state at boot. Disable scaling of the the tunables so that we
can get more consistent behavior of cfs across devices. If we want to
do per-device tuning of these values, we can override what's written
here in device specific files.

Bug: 22634118
Change-Id: Id19b24ef819fef762521e75af55e6d4378cfc949
 2015-07-21 19:49:45 +00:00
Daniel Rosenberg 2a9e682c11 am b381f0a5: am 71ca82bf: am 8da23664: Merge "rootdir: Create cache folder in Android.mk" 
* commit 'b381f0a5e11bf7a75ee0c06ddb4771a1312a1bea':
  rootdir: Create cache folder in Android.mk
 2015-07-20 20:12:09 +00:00
Daniel Rosenberg b381f0a5e1 am 71ca82bf: am 8da23664: Merge "rootdir: Create cache folder in Android.mk" 
* commit '71ca82bf954c4bd5b8817eeabb78418fafde90ce':
  rootdir: Create cache folder in Android.mk
 2015-07-20 19:58:51 +00:00
Daniel Rosenberg d2bb8134d3 am 71ca82bf: am 8da23664: Merge "rootdir: Create cache folder in Android.mk" 
* commit '71ca82bf954c4bd5b8817eeabb78418fafde90ce':
  rootdir: Create cache folder in Android.mk
 2015-07-20 19:56:52 +00:00
Daniel Rosenberg 8da23664e7 Merge "rootdir: Create cache folder in Android.mk" 2015-07-20 19:21:49 +00:00
Elliott Hughes fc1a8c1d35 am 69b2c2a1: am 6657d224: am 069f62de: Merge "Fix N9 boot." 
* commit '69b2c2a125f655a43f54a181d5ddbe714f4848ca':
  Fix N9 boot.
 2015-07-18 18:15:57 +00:00
Elliott Hughes 69b2c2a125 am 6657d224: am 069f62de: Merge "Fix N9 boot." 
* commit '6657d2248e902289476c4b937f5d6a1585c95ec2':
  Fix N9 boot.
 2015-07-18 18:02:01 +00:00
Elliott Hughes 546738a4e7 am 6657d224: am 069f62de: Merge "Fix N9 boot." 
* commit '6657d2248e902289476c4b937f5d6a1585c95ec2':
  Fix N9 boot.
 2015-07-18 18:01:41 +00:00
Elliott Hughes 04b2022f7e Fix N9 boot. 
Without this, sdcard fails to start because its mount point doesn't
exist.

Bug: http://b/22568628
Change-Id: Ic6a2f51fc74c5bd1f23d97592049495ac3822bb3
 2015-07-18 10:34:53 -07:00
Scott Bauer cf0ca50479 Added shell permisisons for memreclaim tracing 2015-07-16 12:26:06 -07:00
Daniel Rosenberg 86b151cbe8 rootdir: Create cache folder in Android.mk 
system.img may contain the root directory as well. In that case, we
need to create some folders init.rc would during the build.

Change-Id: I312104ff926fb08d98ac8256b76d01b0a90ea5e5
 2015-07-14 17:18:52 -07:00
Daniel Rosenberg 15db3551d0 resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp 
Change-Id: Iead524946a84503a6e89c17861d3f54e4cf276a0
 2015-07-14 15:40:25 -07:00
Daniel Rosenberg cdf768fe7c am f3cd170c: am 3470855e: Merge "rootdir: Create folders in Android.mk" 
* commit 'f3cd170cdbc1950a9c5efffb5c41c346c4cba298':
  rootdir: Create folders in Android.mk
 2015-07-14 22:28:10 +00:00
Daniel Rosenberg 6e1fd8dde7 am 1c45c0ff: Merge "resolved conflicts for merge of 074ee014 to mnc-dr-dev-plus-aosp" into mnc-dr-dev-plus-aosp 
* commit '1c45c0ff5d1cbd49d2d77fa837e1be0724fa77b3':
  Remove creation of root directory folders
 2015-07-14 20:41:38 +00:00
Daniel Rosenberg cfda5bb47a resolved conflicts for merge of 074ee014 to mnc-dr-dev-plus-aosp 
Change-Id: I346583851035950350433136599f73ab2bedba4b
 2015-07-14 13:12:48 -07:00
Daniel Rosenberg 6158942f27 am 26a81c1d: am f3cd170c: am 3470855e: Merge "rootdir: Create folders in Android.mk" 
* commit '26a81c1d1a8f7c40cd79648edff0585bfc94e281':
  rootdir: Create folders in Android.mk
 2015-07-14 15:50:15 +00:00
Daniel Rosenberg 26a81c1d1a am f3cd170c: am 3470855e: Merge "rootdir: Create folders in Android.mk" 
* commit 'f3cd170cdbc1950a9c5efffb5c41c346c4cba298':
  rootdir: Create folders in Android.mk
 2015-07-14 15:21:13 +00:00
Paul Crowley b7f1f61fbc am ee923139: Merge "Set up user directory crypto in init." into mnc-dr-dev 
* commit 'ee923139c346e6751203fc7d2a341388e01c7b19':
  Set up user directory crypto in init.
  logd: switch to unordered_map from BasicHashtable
  rootdir: make sure the /oem mountpoint is always available
 2015-07-14 00:27:56 +00:00
Paul Lawrence f3fbfaef22 am c1fa34b9: am d5ef9841: Merge "Change init sequence to support file level encryption" into mnc-dr-dev 
* commit 'c1fa34b9f600c827769b4401d8b12e7c587b68f4':
  Change init sequence to support file level encryption
 2015-07-13 22:39:08 +00:00
Paul Crowley ee923139c3 Merge "Set up user directory crypto in init." into mnc-dr-dev 2015-07-13 20:52:45 +00:00
Paul Lawrence c1fa34b9f6 am d5ef9841: Merge "Change init sequence to support file level encryption" into mnc-dr-dev 
* commit 'd5ef984195779aa9e27d7baabdd751d641eea1a0':
  Change init sequence to support file level encryption
 2015-07-13 17:53:08 +00:00
Daniel Rosenberg 64dffd3975 Remove creation of root directory folders 
Folders in the root directory are now created during the build,
as we may be building without a ramdisk, and when we do that,
the root directory will be read-only.  With those changes,
these mkdirs will never need to run.

Change-Id: I49c63e8bfc71d28e3f938ed41f81d108359fa57a
 2015-07-08 16:37:13 -07:00
Daniel Rosenberg 58458b66d4 rootdir: Create folders in Android.mk 
system.img may contain the root directory as well. In that case, we
need to create some folders init.rc would during the build.

Change-Id: I157ccbebf36bee9916f3f584551704ec481ae1d1
 2015-07-08 16:37:13 -07:00
Paul Lawrence 2ed2e30120 am e8308f85: am 81046166: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev 
* commit 'e8308f852c867bc676e71875ea57de022464ea09':
  Revert "Change init sequence to support file level encryption"
 2015-07-07 20:36:19 +00:00
Paul Lawrence 948410a493 Change init sequence to support file level encryption 
File level encryption must get the key between mounting userdata and
calling post_fs_data when the directories are created. This requires
access to keymaster, which in turn is found from a system property.

Split property loaded into system and data, and load in right order.

Bug: 22233063
 2015-07-07 13:23:19 -07:00
Paul Lawrence e8308f852c am 81046166: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev 
* commit '8104616696ac5e806b16a393ea02c4f5d8efc328':
  Revert "Change init sequence to support file level encryption"
 2015-07-07 18:20:27 +00:00
Paul Lawrence c011b031c9 am 81046166: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev 
* commit '8104616696ac5e806b16a393ea02c4f5d8efc328':
  Revert "Change init sequence to support file level encryption"
 2015-07-07 17:39:03 +00:00
Paul Lawrence 8104616696 Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev 2015-07-07 17:29:00 +00:00
Paul Lawrence 437bc5dcec Revert "Change init sequence to support file level encryption" 
This reverts commit d815178b75.

Change-Id: I7e3f55d3092fcd04ea9f62f1971c9d42570f096c
 2015-07-07 17:05:58 +00:00
Andres Morales d80e243411 am 722d4a54: am 833f142d: Merge "[init] start gatekeeperd after device decryption" into mnc-dev 
* commit '722d4a54d9fa49581931e7c88fee5aa0c1f3c5f8':
  [init] start gatekeeperd after device decryption
 2015-07-07 01:09:04 +00:00
Paul Lawrence 1c875cc40f am 22d0ee6a: am a65e402b: Merge "Change init sequence to support file level encryption" into mnc-dev 
* commit '22d0ee6a25b3bedd6c3cd52473df1404fce8615f':
  Change init sequence to support file level encryption
 2015-07-07 00:32:17 +00:00
Andres Morales 722d4a54d9 am 833f142d: Merge "[init] start gatekeeperd after device decryption" into mnc-dev 
* commit '833f142d201a4b682885ff9d95c6b3ab32fd0618':
  [init] start gatekeeperd after device decryption
 2015-07-06 23:57:49 +00:00
Andres Morales 775b58d08f am 833f142d: Merge "[init] start gatekeeperd after device decryption" into mnc-dev 
* commit '833f142d201a4b682885ff9d95c6b3ab32fd0618':
  [init] start gatekeeperd after device decryption
 2015-07-06 23:10:31 +00:00
Andres Morales 833f142d20 Merge "[init] start gatekeeperd after device decryption" into mnc-dev 2015-07-06 23:00:09 +00:00
Paul Lawrence 22d0ee6a25 am a65e402b: Merge "Change init sequence to support file level encryption" into mnc-dev 
* commit 'a65e402b613e927697d35e7936c6d80908d77e88':
  Change init sequence to support file level encryption
 2015-07-06 20:34:05 +00:00
Paul Lawrence d3669ff27f am a65e402b: Merge "Change init sequence to support file level encryption" into mnc-dev 
* commit 'a65e402b613e927697d35e7936c6d80908d77e88':
  Change init sequence to support file level encryption
 2015-07-06 19:52:40 +00:00
Andres Morales 4dd2982dd3 [init] start gatekeeperd after device decryption 
gatekeeperd depends on having /data to determine whether
to call setup routines for qcom HALs.

Bug: 22298552
Change-Id: I6c552016dc863bbb04bd5a949a2317a720c8263f
 2015-07-06 12:00:22 -07:00
Paul Lawrence d815178b75 Change init sequence to support file level encryption 
File level encryption must get the key between mounting userdata and
calling post_fs_data when the directories are created. This requires
access to keymaster, which in turn is found from a system property.

Split property loaded into system and data, and load in right order.

Bug: 22233063
Change-Id: I8a6c40d44e17de386417a443c9dfc3b4e7fe59a5
 2015-07-06 07:52:06 -07:00
Jeff Sharkey 35e0cc552c am 96835733: am f38f29c8: Let\'s reinvent storage, yet again! 
* commit '96835733b397da908c86e2a1190b8c8baf06a441':
  Let's reinvent storage, yet again!
 2015-06-26 16:18:13 +00:00
Jeff Sharkey 96835733b3 am f38f29c8: Let\'s reinvent storage, yet again! 
* commit 'f38f29c87d97cea45d04b783bddbd969234b1030':
  Let's reinvent storage, yet again!
 2015-06-26 16:05:20 +00:00
Jeff Sharkey f38f29c87d Let's reinvent storage, yet again! 
Now that we're treating storage as a runtime permission, we need to
grant read/write access without killing the app.  This is really
tricky, since we had been using GIDs for access control, and they're
set in stone once Zygote drops privileges.

The only thing left that can change dynamically is the filesystem
itself, so let's do that.  This means changing the FUSE daemon to
present itself as three different views:

/mnt/runtime_default/foo - view for apps with no access
/mnt/runtime_read/foo - view for apps with read access
/mnt/runtime_write/foo - view for apps with write access

There is still a single location for all the backing files, and
filesystem permissions are derived the same way for each view, but
the file modes are masked off differently for each mountpoint.

During Zygote fork, it wires up the appropriate storage access into
an isolated mount namespace based on the current app permissions.  When
the app is granted permissions dynamically at runtime, the system
asks vold to jump into the existing mount namespace and bind mount
the newly granted access model into place.

Bug: 21858077
Change-Id: I5a016f0958a92fd390c02b5ae159f8008bd4f4b7
 2015-06-25 22:27:04 -07:00
Evgenii Stepanov c25f0dc38b am c7b86c16: am eaa97876: am 2e8d31f6: Merge "SANITIZE_TARGET: set global ASAN_OPTIONS" 
* commit 'c7b86c1661c7d178784dc2b9f09e478569a2886c':
  SANITIZE_TARGET: set global ASAN_OPTIONS
 2015-06-24 18:30:03 +00:00
Evgenii Stepanov c7b86c1661 am eaa97876: am 2e8d31f6: Merge "SANITIZE_TARGET: set global ASAN_OPTIONS" 
* commit 'eaa978768beef315c5dca9db964d4e80c462cf74':
  SANITIZE_TARGET: set global ASAN_OPTIONS
 2015-06-24 18:12:24 +00:00
Paul Crowley 749af8c08f Set up user directory crypto in init. 
(cherry-picked from commit b94032b79c)

Bug: 19704432
Change-Id: Ife4928ffbee39c8ae69e6ba66d9ce5ef5a0beb76
 2015-06-23 15:21:51 +00:00
Pavlin Radoslavov a88a084e94 am 233286f4: am 4caa9f39: Merge "Fix the file permissions of /data/misc/bluedroid/bt_config.conf" into mnc-dev 
* commit '233286f40bdd84ad26b5ebf615d9f62fc30e19bf':
  Fix the file permissions of /data/misc/bluedroid/bt_config.conf
 2015-06-23 01:39:01 +00:00
Pavlin Radoslavov 233286f40b am 4caa9f39: Merge "Fix the file permissions of /data/misc/bluedroid/bt_config.conf" into mnc-dev 
* commit '4caa9f39bb3415358dcb737d0eb9058c34192806':
  Fix the file permissions of /data/misc/bluedroid/bt_config.conf
 2015-06-23 01:31:49 +00:00
Pavlin Radoslavov 8175bb2352 Fix the file permissions of /data/misc/bluedroid/bt_config.conf 
Fix the file access permissions and group ownership of
"/data/misc/bluedroid/bt_config.conf" so the file can be reused when
switching users on the device.
For that purpose, we need to do the following:

1. Set the set-group-ID (bit 02000) flag for directory "/data/misc/bluedroid"
   so the files created in that directory will have group-id of
   "net_bt_stack" .

2. Change the file's permissions of file "/data/misc/bluedroid/bt_config.conf"
   to Read/Write by User and Group.

Bug: 21493919
Change-Id: Ie00ab4695198ef2aa299b484ef9d4f17bd41b98a
 2015-06-22 10:19:30 -07:00
Evgenii Stepanov 1cbe3d944a SANITIZE_TARGET: set global ASAN_OPTIONS 
allow_user_segv_handler=1 is required to run ART under ASan
detect_odr_violation=0 and alloc_dealloc_mismatch=0 suppress some of
the existing bug reports during boot.

Bug: 21951850, 21785137
Change-Id: I4d36967c6d8d936dacbfdf1b94b87fa94766bd3e
 2015-06-19 11:15:51 -07:00
Tim Kilbourn c15560d496 Merge "Don't restart zygote when inputflinger dies." 2015-06-12 21:33:32 +00:00
Tim Kilbourn 766ca5cd6c Merge "Revert "Track removal of the inputflinger binary."" 2015-06-12 21:33:01 +00:00
Tim Murray 83da7c6a54 am 63e38313: am e5b0c837: Merge "add cpuset support to libcutils" into mnc-dev 
* commit '63e383136b8a76fdf619aa878b58b815a094e6ee':
  add cpuset support to libcutils
 2015-06-12 19:15:46 +00:00
Tim Murray 63e383136b am e5b0c837: Merge "add cpuset support to libcutils" into mnc-dev 
* commit 'e5b0c837856007812ace8ec5849f6852015d5d2b':
  add cpuset support to libcutils
 2015-06-12 19:03:30 +00:00
Tim Murray b769c8d24f add cpuset support to libcutils 
bug 21782794

Change-Id: I249531754fb29442dc3c7434d77dbb103f4220a7
 2015-06-11 18:35:46 -07:00
Tim Kilbourn 7c6020ba53 Don't restart zygote when inputflinger dies. 
During development it is useful to be able to kill inputflinger and have
init restart it without bringing down the entire system server.

Change-Id: I8b13b94331c5045086db2f5c73a8f49efc5992cb
 2015-06-10 23:42:15 +00:00
Tim Kilbourn f8fcd6a616 Revert "Track removal of the inputflinger binary." 
This reverts commit 2422c17c5e.

Change-Id: I11d1624947dcc3cdcd0d648de6cc25901c91dac6
 2015-06-10 13:22:05 -07:00
Tao Bao 04b10b9aa3 Change pre-recovery into two services 
/system/bin/uncrypt needs to be triggered to prepare the OTA package
before rebooting into the recovery. Separate pre-recovery (uncrypt)
into two services: uncrypt that does the uncryption work and
pre-recovery that actually reboots the device into recovery.

Also create /cache/recovery on post-fs in case it doesn't exist.

Bug: 20012567
Bug: 20949086
(cherry picked from commit e48aed0f0a)
Change-Id: I9877cd6ac9412ea6a566bb1ec0807940c7a38ce5
 2015-06-09 14:52:43 -07:00
Paul Lawrence b183361199 am a7dcec1d: am 3678a5fb: Merge "Move crypt commands to a different listener in vold" into mnc-dev 
* commit 'a7dcec1da38c15d5e5ede7bfdec7ffd880cb6b82':
  Move crypt commands to a different listener in vold
 2015-06-05 00:47:36 +00:00
Paul Lawrence a7dcec1da3 am 3678a5fb: Merge "Move crypt commands to a different listener in vold" into mnc-dev 
* commit '3678a5fb8d1094c4796c1316f3b571cb63cf7246':
  Move crypt commands to a different listener in vold
 2015-06-04 23:07:32 +00:00
Paul Lawrence 3678a5fb8d Merge "Move crypt commands to a different listener in vold" into mnc-dev 2015-06-04 21:32:44 +00:00
Nick Kralevich 7dbe806939 am e2722e9b: am a20d6f4e: am 2ec88501: Merge "tzdatacheck: don\'t hard code SELinux domain name" 
* commit 'e2722e9bfbeb2f2f349493fbe9b464c24e416ee0':
  tzdatacheck: don't hard code SELinux domain name
 2015-06-03 22:25:14 +00:00
Paul Lawrence 37fcc5d73e Move crypt commands to a different listener in vold 
In order to prevent this bug from happening, we must allow vold cryptfs
commands to complete while a long running mount is underway.

While waiting for vold to be changed to a binder interface, we will simply
create two listeners, one for cryptfs and one for everything else.

Bug: 19197175
Change-Id: Ie3d9567819ced7757b0a8f391547f27db944153c
 2015-06-03 14:19:29 -07:00
Nick Kralevich e2722e9bfb am a20d6f4e: am 2ec88501: Merge "tzdatacheck: don\'t hard code SELinux domain name" 
* commit 'a20d6f4e154939722263207ddf5954b3f58f666d':
  tzdatacheck: don't hard code SELinux domain name
 2015-06-03 20:53:31 +00:00
Nick Kralevich 32512e7167 tzdatacheck: don't hard code SELinux domain name 
An automatic domain transition is already defined by SELinux
policy. Avoid having redundant information on the exec line.

This commit depends on commit 17fff893c0
which made the SELinux process label optional.

(cherrypicked from commit 221fca7ddd)

Change-Id: I89464f2bd218c7d6e8db08aa6bed2b62ec6dad2a
 2015-06-03 13:36:24 -07:00
Nick Kralevich 221fca7ddd tzdatacheck: don't hard code SELinux domain name 
An automatic domain transition is already defined by SELinux
policy. Avoid having redundant information on the exec line.

This commit depends on commit 17fff893c0
which made the SELinux process label optional.

Change-Id: I89464f2bd218c7d6e8db08aa6bed2b62ec6dad2a
 2015-06-03 13:08:49 -07:00
Paul Crowley b94032b79c Set up user directory crypto in init. 
Bug: 19704432
Change-Id: Ife4928ffbee39c8ae69e6ba66d9ce5ef5a0beb76
 2015-06-03 13:45:15 +01:00
Paul Crowley f8a6fa503f Restore creation of /data/misc/vold erroneously rolled back 
Rollback commit: 9f403450bc

Bug: 19704432
Change-Id: I1a73a2e1d3f4d5441df4d686d420d3a79b3e95bc
 2015-06-03 13:43:25 +01:00
Mark Salyzyn d8a99287a4 am 56051554: am e0e56563: am 0bda352f: Merge changes from topic \'logcatd\' 
* commit '560515540d3ef4da9dc58e3b7fcfeb6c067bb677':
  init.rc: logd: Add logpersistd (nee logcatd)
  init: change exec parsing to make SECLABEL optional
  logcat: -f run in background
  logcat: -f flag to continue
 2015-06-02 22:52:31 +00:00
Mark Salyzyn 560515540d am e0e56563: am 0bda352f: Merge changes from topic \'logcatd\' 
* commit 'e0e565635a7c6c36a05282622c01203afbec5ca5':
  init.rc: logd: Add logpersistd (nee logcatd)
  init: change exec parsing to make SECLABEL optional
  logcat: -f run in background
  logcat: -f flag to continue
 2015-06-02 22:41:29 +00:00
Mark Salyzyn 49ed105fd9 init.rc: logd: Add logpersistd (nee logcatd) 
(cherry pick from commit 100658c303)

- logpersistd is defined as a thread or process in the context of the
  logd domain. Here we define logpersistd as logcat -f in logd domain
  and call it logcatd to represent its service mechanics.
- Use logcatd to manage content in /data/misc/logd/ directory.
- Only turn on for persist.logd.logpersistd = logcatd.
- Add logpersist.start, logpersist.stop and logpersist.cat debug
  class executables, thus only in the eng and userdebug builds.

ToDo: Wish to add Developer Options menu to turn this feature on or
off, complicated by the fact that user builds have no tools with
access rights to /data/misc/logd.

Bug: 19608716
Change-Id: I57ad757f121c473d04f9fabe9d4820a0eca06f31
 2015-06-02 15:28:36 -07:00
Mark Salyzyn 100658c303 init.rc: logd: Add logpersistd (nee logcatd) 
- logpersistd is defined as a thread or process in the context of the
  logd domain. Here we define logpersistd as logcat -f in logd domain
  and call it logcatd to represent its service mechanics.
- Use logcatd to manage content in /data/misc/logd/ directory.
- Only turn on for persist.logd.logpersistd = logcatd.
- Add logpersist.start, logpersist.stop and logpersist.cat debug
  class executables, thus only in the eng and userdebug builds.

ToDo: Wish to add Developer Options menu to turn this feature on or
off, complicated by the fact that user builds have no tools with
access rights to /data/misc/logd.

Bug: 19608716
Change-Id: I57ad757f121c473d04f9fabe9d4820a0eca06f31
 2015-06-02 15:17:59 -07:00
Mark Salyzyn 473a50f168 rootdir: init.trace.rc too early 
(cherry pick from commit 89357d23a1)

debugfs is mounted on boot

Bug: 21566233
Change-Id: I2ba106fbb1e8164ff3d8b2d5b16a16d7926c2732
 2015-06-02 14:40:10 -07:00
Mark Salyzyn e8f74ae706 am c79daf52: am 1300b16e: am 66e39275: Merge "rootdir: init.trace.rc too early" 
* commit 'c79daf522566655c5e18a62c54ae484d14de5373':
  rootdir: init.trace.rc too early
 2015-06-02 21:33:25 +00:00
Mark Salyzyn c79daf5225 am 1300b16e: am 66e39275: Merge "rootdir: init.trace.rc too early" 
* commit '1300b16e51045b0d1235cfaaa031228ded60924b':
  rootdir: init.trace.rc too early
 2015-06-02 21:22:37 +00:00
Mark Salyzyn 89357d23a1 rootdir: init.trace.rc too early 
debugfs is mounted on boot

Bug: 21566233
Change-Id: I2ba106fbb1e8164ff3d8b2d5b16a16d7926c2732
 2015-06-02 12:51:42 -07:00
Paul Lawrence 0a423d994a DO NOT MERGE Securely encrypt the master key 
(chery-picked from commit 806d10be23)

Move all key management into vold
Reuse vold's existing key management through the crypto footer
to manage the device wide keys.

Use ro.crypto.type flag to determine crypto type, which prevents
any issues when running in block encrypted mode, as well as speeding
up boot in block or no encryption.

This is one of four changes to enable this functionality:
  https://android-review.googlesource.com/#/c/148586/
  https://android-review.googlesource.com/#/c/148604/
  https://android-review.googlesource.com/#/c/148606/
  https://android-review.googlesource.com/#/c/148607/

Bug: 18151196

Change-Id: I6a8a18f43ae837e330e2785bd26c2c306ae1816b
 2015-05-29 17:39:16 +00:00
Tao Bao 7cc023a7d5 am 6b0938f7: am 6484f3d1: Merge "Change pre-recovery into two services" into mnc-dev 
* commit '6b0938f7fb39ad4ad071c2b493545409a3d69f41':
  Change pre-recovery into two services
 2015-05-28 23:06:26 +00:00
Tao Bao 6b0938f7fb am 6484f3d1: Merge "Change pre-recovery into two services" into mnc-dev 
* commit '6484f3d1cb4078c7525e23d16c7e7bcd90afa653':
  Change pre-recovery into two services
 2015-05-28 22:51:29 +00:00
Tao Bao 6484f3d1cb Merge "Change pre-recovery into two services" into mnc-dev 2015-05-28 21:48:16 +00:00
Than McIntosh 7c3f575c8a am a4fd555f: am 51f8aa27: am f166e38b: Merge "Move perfprofd to late_start class." 
* commit 'a4fd555fc9654ba18d947deb13edae303172d575':
  Move perfprofd to late_start class.
 2015-05-28 17:39:18 +00:00
Than McIntosh a4fd555fc9 am 51f8aa27: am f166e38b: Merge "Move perfprofd to late_start class." 
* commit '51f8aa27fdc5675cf0e621af6e14625a24720ff0':
  Move perfprofd to late_start class.
 2015-05-28 17:19:32 +00:00
Than McIntosh b37c45e90a Move perfprofd to late_start class. 
Bug: http://b/19483574
Change-Id: I88649b50b95cbddb7d0671a5499232cbef156c48
(cherry picked from commit e8efd0d6bf)
 2015-05-28 11:58:31 -04:00
Than McIntosh e8efd0d6bf Move perfprofd to late_start class. 
Bug: http://b/19483574
Change-Id: I88649b50b95cbddb7d0671a5499232cbef156c48
 2015-05-27 14:02:11 -04:00
Paul Lawrence 9f403450bc am ffdac6dd: am f0b318d6: am 7c789575: Merge "Revert "Set up crypto for user directories in init."" 
* commit 'ffdac6ddf2e13370674821159edd9663b5302707':
  Revert "Set up crypto for user directories in init."
 2015-05-22 21:42:39 +00:00
Paul Lawrence ffdac6ddf2 am f0b318d6: am 7c789575: Merge "Revert "Set up crypto for user directories in init."" 
* commit 'f0b318d61cc129f4ddd25859500857b9f8e34e69':
  Revert "Set up crypto for user directories in init."
 2015-05-22 19:41:48 +00:00
Paul Lawrence 2e24bcfdce Revert "Set up crypto for user directories in init." 
Causes a boot loop in Shamu

This reverts commit ce6f716096.

Bug: 21396871
Change-Id: I9709053c589807d4530a3a99bd84e5b3177316cd
 2015-05-22 18:32:45 +00:00
Paul Crowley 83e670e687 am e8cbb421: am 5f3c715e: am 7f623dec: Merge "Set up crypto for user directories in init." 
* commit 'e8cbb421cd28ec754923a88a919557ee5b174411':
  Set up crypto for user directories in init.
 2015-05-21 22:12:58 +00:00
Paul Crowley e8cbb421cd am 5f3c715e: am 7f623dec: Merge "Set up crypto for user directories in init." 
* commit '5f3c715e1a8331f13ea39264b24dfc03ac8db060':
  Set up crypto for user directories in init.
 2015-05-21 21:59:40 +00:00
Paul Crowley ce6f716096 Set up crypto for user directories in init. 
Depends on https://android-review.googlesource.com/#/c/147911/

Bug: 19704432
Change-Id: Ie59c6b67f73c1cadd86e69d3c9673ddaddb49a7e
 2015-05-20 08:28:21 +01:00
Tao Bao e48aed0f0a Change pre-recovery into two services 
/system/bin/uncrypt needs to be triggered to prepare the OTA package
before rebooting into the recovery. Separate pre-recovery (uncrypt)
into two services: uncrypt that does the uncryption work and
pre-recovery that actually reboots the device into recovery.

Also create /cache/recovery on post-fs in case it doesn't exist.

Bug: 20012567
Bug: 20949086
Change-Id: If67fe1e9ee6279593d2788452febcd3f0fe714c2
 2015-05-19 10:04:56 -07:00
Terry Heo 7ae36219a3 am e4c6666e: am 55431d97: Merge "rootdir: add permission for /dev/dvb*" into mnc-dev 
* commit 'e4c6666ea9477b34a535cf9208907277cefa1827':
  rootdir: add permission for /dev/dvb*
 2015-05-13 06:17:25 +00:00
Terry Heo e4c6666ea9 am 55431d97: Merge "rootdir: add permission for /dev/dvb*" into mnc-dev 
* commit '55431d97459210f0f4ac66538ca6cbf8cf3511e9':
  rootdir: add permission for /dev/dvb*
 2015-05-13 06:06:37 +00:00
Kevin Cernekee 1f0dd2210b ueventd.rc: Document the different rule formats for /dev and /sys nodes 
This was causing some confusion during shark bringup and we weren't able
to find docs online, so let's add some hints at the top of the file in
case it comes up again.

Change-Id: Ica2cd8a0fb28efb99077fdc98673dbbdd6f58ff6
Signed-off-by: Kevin Cernekee <cernekee@google.com>
 2015-05-12 09:56:34 -07:00
Dehao Chen 0853afe8aa am 3ce52a57: am ac725c12: Add /data/misc/perfprofd to store perf profile. 
* commit '3ce52a57c5db5de2eff7cb14497279c7a6e157e8':
  Add /data/misc/perfprofd to store perf profile.
 2015-05-07 08:18:19 +00:00
Nick Kralevich ed8ad59789 am 0847d1bf: am 6ee69177: rootdir: make sure the /oem mountpoint is always available 
* commit '0847d1bf2f16aa7161c5b4a01272991500d8609e':
  rootdir: make sure the /oem mountpoint is always available
 2015-05-07 08:18:18 +00:00
Terry Heo bf81356e22 rootdir: add permission for /dev/dvb* 
Bug: 20112245
Change-Id: I513c6ed5b65d5bd4edef6cb12d7fc20eb9cad4f1
 2015-05-07 16:49:00 +09:00
Dehao Chen 3ce52a57c5 am ac725c12: Add /data/misc/perfprofd to store perf profile. 
* commit 'ac725c12da8a67ca33d10c7b6131f8f543ed4449':
  Add /data/misc/perfprofd to store perf profile.
 2015-05-07 05:27:05 +00:00
Nick Kralevich 0847d1bf2f am 6ee69177: rootdir: make sure the /oem mountpoint is always available 
* commit '6ee6917757bd4b00437cabe07fbaa48ce2621b38':
  rootdir: make sure the /oem mountpoint is always available
 2015-05-07 05:25:21 +00:00
Dehao Chen ac725c12da Add /data/misc/perfprofd to store perf profile. 
BUG: 19483574

(cherry picked from commit 30c401fa92)

Change-Id: Ibf96db9f7e5db625b395db20b73572acc240b1f9
 2015-05-06 15:09:23 -07:00
Nick Kralevich 577c1245aa Merge "Add /data/misc/perfprofd to store perf profile." 2015-05-06 21:49:51 +00:00
Nick Kralevich 6ee6917757 rootdir: make sure the /oem mountpoint is always available 
The /oem mount point is used to mount semi-trusted data, and
many Android One devices depend on it. Make sure it's guaranteed
to always be available.

(cherrypicked from commit f3b554fc61)

Bug: 20816563
Change-Id: Ib5272f025d14d4da6125d753879054b3faeae696
 2015-05-06 13:43:15 -07:00
Nick Kralevich f3b554fc61 rootdir: make sure the /oem mountpoint is always available 
The /oem mount point is used to mount semi-trusted data, and
many Android One devices depend on it. Make sure it's guaranteed
to always be available.

Bug: 20816563
Change-Id: Ib5272f025d14d4da6125d753879054b3faeae696
 2015-05-05 17:19:14 -07:00
Dehao Chen 30c401fa92 Add /data/misc/perfprofd to store perf profile. 
BUG: 19483574

Change-Id: Ib5eb9e789c063bd76d24181c4c03652f9ef12cb7
 2015-05-05 15:06:21 -07:00
Than McIntosh 7d678d8d78 Invoke perfprofd daemon (only for userdebug/eng builds). 
Change-Id: Ifaabe32dda6db249efc62c5db3760e32295eb1a9
(cherry picked from commit d6544d2a40)
 2015-05-04 11:50:27 -07:00
Elliott Hughes b12facc2e2 am d5fb597c: am 5ea5aaa5: am a668478e: Merge "Invoke perfprofd daemon (only for userdebug/eng builds)." 
* commit 'd5fb597c8d21215273e0c48b494a13f989c212dd':
  Invoke perfprofd daemon (only for userdebug/eng builds).
 2015-05-01 22:47:07 +00:00
Elliott Hughes d5fb597c8d am 5ea5aaa5: am a668478e: Merge "Invoke perfprofd daemon (only for userdebug/eng builds)." 
* commit '5ea5aaa561fc011bf58332d48fb6bbf102cc40a4':
  Invoke perfprofd daemon (only for userdebug/eng builds).
 2015-05-01 22:35:54 +00:00
Paul Lawrence dd764f5192 Fix whitespace 
Change-Id: If13df64f6ba61e0f8742e85a332dea7c5e7640af
 2015-04-29 14:16:58 -07:00
Paul Lawrence b8fca94e81 Merge commit '2fe6a631' into manualmerge 
Change-Id: Ib8d61ee25711e86a2df3705e87904a50c0ef5187
 2015-04-29 09:56:26 -07:00
Paul Lawrence 806d10be23 Securely encrypt the master key 
Move all key management into vold
Reuse vold's existing key management through the crypto footer
to manage the device wide keys.

Use ro.crypto.type flag to determine crypto type, which prevents
any issues when running in block encrypted mode, as well as speeding
up boot in block or no encryption.

This is one of four changes to enable this functionality:
  https://android-review.googlesource.com/#/c/148586/
  https://android-review.googlesource.com/#/c/148604/
  https://android-review.googlesource.com/#/c/148606/
  https://android-review.googlesource.com/#/c/148607/

Bug: 18151196

Change-Id: I6a8a18f43ae837e330e2785bd26c2c306ae1816b
 2015-04-28 15:34:10 -07:00
Paul Lawrence 658801ff9f resolved conflicts for merge of 6a5244bc to mnc-dev-plus-aosp 
Change-Id: Ied1bbf09aeeed53daefb53c559498066abd9b767
 2015-04-28 14:28:44 -07:00
Paul Lawrence 2b3a493946 Merge "Revert "Securely encrypt the master key"" 2015-04-28 19:15:40 +00:00
Paul Lawrence 7ac2807546 Revert "Securely encrypt the master key" 
This reverts commit 4bf1887c78.

Change-Id: Ie6d1f39de530b99b50a27ddc45bcc900a24e04b5
 2015-04-28 19:15:01 +00:00
Than McIntosh d6544d2a40 Invoke perfprofd daemon (only for userdebug/eng builds). 
Change-Id: Ifaabe32dda6db249efc62c5db3760e32295eb1a9
 2015-04-28 14:32:35 -04:00
Paul Lawrence 7880f812f7 resolved conflicts for merge of 72fad66f to mnc-dev-plus-aosp 
Change-Id: Ib6659a50ee3f1f1ac3719e5d3397c21f786b9afc
 2015-04-27 14:44:15 -07:00
Paul Lawrence 9234b169e6 Merge "Securely encrypt the master key" 2015-04-27 20:08:53 +00:00
Mark Salyzyn 5cb4c8796c Revert "STOPSHIP: WifiStateMachine logging temporarily disabled" 
This reverts commit 15ae6c2e7c.

Change-Id: I281a65209a5118a6c73ddec65ed40d149c23bf0b
 2015-04-24 21:32:17 +00:00
Mark Salyzyn b2beaf7b20 Merge "Revert "STOPSHIP: Additional Wifi logging temporarily disabled"" 2015-04-24 21:30:22 +00:00
Elliott Hughes 03c9267865 am a8088f38: am ec389902: am 132440b0: Merge "Revert "Revert "Make init re-exec itself for its SELinux domain transition.""" 
* commit 'a8088f380932d873a39fafdd816f96328f7caa9c':
  Revert "Revert "Make init re-exec itself for its SELinux domain transition.""
 2015-04-24 21:09:34 +00:00
Mark Salyzyn ea782d327a Revert "STOPSHIP: Additional Wifi logging temporarily disabled" 
This reverts commit 18b1da2033.

Change-Id: I86cde061a36a9a9e43c8a5df2df1e853ed32b7a0
 2015-04-24 20:28:27 +00:00
Elliott Hughes f65730e620 Revert "Revert "Make init re-exec itself for its SELinux domain transition."" 
This reverts commit 4217374611.

It turns out that the kernel passes any unrecognized arguments on to init,
and (at least) N6 and N9 have such arguments. My lazy check of argc was
thus insufficient to recognize what stage of init we were in, so we'd
skip to stage 2 and not set up SELinux. And apparently you can get a
very long way with SELinux off... We'll fix that in a later change.

Bug: 19702273
Change-Id: I43b3fb722fed35dd217cb529cbcac9a29aff4e4b
 2015-04-24 12:26:05 -07:00
Nick Kralevich d6069e21ee am b706a8ac: am 2db3cd3e: am 46fee19c: Merge "Revert "Make init re-exec itself for its SELinux domain transition."" 
* commit 'b706a8acff9c62da7b4045374b93a8739671a8a0':
  Revert "Make init re-exec itself for its SELinux domain transition."
 2015-04-24 17:37:42 +00:00
Nick Kralevich 46fee19cb2 Merge "Revert "Make init re-exec itself for its SELinux domain transition."" 2015-04-24 16:58:01 +00:00
Nick Kralevich 4217374611 Revert "Make init re-exec itself for its SELinux domain transition." 
shamu isn't booting.

This reverts commit adf0d1bbfa.

Change-Id: I89d568838cebbe14cc4a8ae3843f0f1ac54987af
 2015-04-24 16:57:21 +00:00
Elliott Hughes 8e9b756eab am 77260323: am 20dfbb0f: am fa66b4e1: Merge "Remove long-obsolete file." 
* commit '77260323e2e99a996351a98a44ef56db5f1e2767':
  Remove long-obsolete file.
 2015-04-24 04:42:23 +00:00
Elliott Hughes 2a87d2b155 Remove long-obsolete file. 
Change-Id: I728cc13b4a7ac93f9c923d2fc9bda2bb65ffe99d
 2015-04-23 20:57:12 -07:00
Elliott Hughes 45a2329b2d am 77434ab3: am ef68fd3f: am d4656784: Merge "Make init re-exec itself for its SELinux domain transition." 
* commit '77434ab362b3234accf16499aaf2a5340d568553':
  Make init re-exec itself for its SELinux domain transition.
 2015-04-24 03:51:12 +00:00
Elliott Hughes d46567848b Merge "Make init re-exec itself for its SELinux domain transition." 2015-04-24 03:10:16 +00:00
Mark Salyzyn 7076796cab am 44f1356e: am 85a9566f: am 76520752: Merge "rootfs: init.rc start logd parse error" 
* commit '44f1356e42a64fefb194b5c74b62402f4ec2881e':
  rootfs: init.rc start logd parse error
 2015-04-23 23:16:39 +00:00
Mark Salyzyn 765207524f Merge "rootfs: init.rc start logd parse error" 2015-04-23 22:25:30 +00:00
Elliott Hughes adf0d1bbfa Make init re-exec itself for its SELinux domain transition. 
Change-Id: I38adabe5789d671e3f7d21936071a758ec8cea8a
 2015-04-23 15:20:51 -07:00
Paul Lawrence 4bf1887c78 Securely encrypt the master key 
Remove unencrypted link since it is easier to manage directly
Move creation of key to vold
Start vold early so this is possible in a timely fashion

This is one of four changes to enable this functionality:
  https://android-review.googlesource.com/#/c/144586/
  https://android-review.googlesource.com/#/c/144663/
  https://android-review.googlesource.com/#/c/144672/
  https://android-review.googlesource.com/#/c/144673/

Bug: 18151196
Change-Id: Idb17d1f1a724c6ec509d181ae4427113e9d3b5e6
 2015-04-23 10:23:03 -07:00
Mark Salyzyn 18b1da2033 STOPSHIP: Additional Wifi logging temporarily disabled 
Bug: 20416721
Change-Id: I1be1c742f47f0e673eef6a8d391246f47c35c336
 2015-04-21 23:09:58 +00:00
Mark Salyzyn 15ae6c2e7c STOPSHIP: WifiStateMachine logging temporarily disabled 
Bug: 20416721
Change-Id: Id60eb6ab77589ab50800532de0d2877adef1d5b7
 2015-04-21 22:39:09 +00:00
Mark Salyzyn 5c39e0ada8 rootfs: init.rc start logd parse error 
init: /init.rc: 490: invalid option 'start'

Change-Id: Ica985e45d4652dab0ebd434803344f14cc73d834
 2015-04-20 15:56:14 +00:00
Nick Kralevich 1450586ffd create /data/misc/gatekeeper 
Change-Id: I7631401ac21b60a22f6fd4052814186bf3bc2b05
 2015-04-20 08:55:12 -07:00
Andres Morales 4e9da84be1 Merge "Implement SID API" 2015-04-16 22:16:58 +00:00
Andres Morales 6a49c2fa43 Implement SID API 
Change-Id: Id11632a6b4b9cab6f08f97026dd65fdf49a46491
 2015-04-16 13:17:54 -07:00