Paul Crowley
f8a6fa503f
Restore creation of /data/misc/vold erroneously rolled back
...
Rollback commit: 9f403450bc
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
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
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
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
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
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
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
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
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
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
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
2015-04-24 12:26:05 -07:00
