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
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
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
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
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
Vinit Deshpande
b63190fda8
am b4ef85c..b4ef85c from mirror-m-wireless-internal-release
...
b4ef85c
Add Bluetooth SAP UIM socket
2015-04-14 15:06:55 -07:00
Neil Fuller
13859d1230
am 90014d61: am 532d0a11: am 9b83b623: Merge "Executable to run on boot that removes old tzdata if needed"
...
* commit '90014d61c83ef5105881c171481a50f21fd4dd57':
Executable to run on boot that removes old tzdata if needed
2015-04-13 12:18:34 +00:00
Neil Fuller
08913228e1
Executable to run on boot that removes old tzdata if needed
...
tzdatacheck is exec'd from init.rc early in boot just after /data is
mounted. It checks to make sure that the tz rule data in /data
is newer than the version in /system. If the data is older it is
deleted. This is to address problems with earlier tz rule updates
that occurred: after an OTA upgrade previous updates in /data
would override newer versions in the system partition.
Includes change to init.rc neccessary to run it at boot time. Other
changes are in external/selinux.
Bug: 19941636
Bug: https://code.google.com/p/android/issues/detail?id=35730
Change-Id: I7cc61e058424c856da88f11ff9b259f34cb39dc7
2015-04-13 11:38:32 +01:00
Dheeraj Shetty
b4ef85c636
Add Bluetooth SAP UIM socket
...
Change-Id: I1445e51f613ac3e21cf818c0b1364c334579593e
2015-04-12 22:16:35 -07:00
Andres Morales
2d08dce0be
GateKeeper proxy service
...
Until we have SELinux support for gating access
to individual TEE services, we will proxy TEE requests
to GateKeeper via this daemon.
Change-Id: Ifa316b75f75bff79bdae613a112c8c3c2e7189a8
2015-04-08 15:20:22 -07:00
Mark Salyzyn
6abe429588
am 4122304d: am 07e3ed46: am c19572fa: Merge "rootfs: init start logd in post-fs"
...
* commit '4122304de3990ca1fca2790468fb8e9ddcca11f2':
rootfs: init start logd in post-fs
2015-04-08 16:56:04 +00:00
Mark Salyzyn
124ff15bca
rootfs: init start logd in post-fs
...
The earliest point we can start logd is after /system is mounted.
Ideally on post-fs-system (does not exist), post-fs will do.
As insurance, we will also make sure logd is started if a
logd-reinit is requested. This results in logd starting at least
4 processes earlier than it does currently, with a tighter
grouping of threads which means we are taking advantage of a
lighter CPU load at the time, rather than taking cycles during
heavy activity during core startup.
Change-Id: If4f0bd3a53bb4c47500a54d741ca635d87c0c330
2015-04-08 09:18:50 -07:00
Nick Kralevich
bd3212fd92
am 5056cdcd: am 01190672: am de957955: Merge "Create /data/system/heapdump for system_server"
...
* commit '5056cdcdde4901fe667522cfebf3e1f9e1af3b3b':
Create /data/system/heapdump for system_server
2015-04-08 01:06:59 +00:00
Nick Kralevich
9c0437fba7
Create /data/system/heapdump for system_server
...
Bug: 20073185
Change-Id: I6fd83d33da33d048fdd6b07fa1f675ecb4f4eb2c
2015-04-07 16:44:43 -07:00
Jeff Sharkey
ae0a5acc0e
Mount point for expanded storage.
...
Managed by vold.
Bug: 19993667
Change-Id: I7957b44d37d6a1f572cbec515d03856a8ed54391
2015-04-06 17:42:14 -07:00
Paul Lawrence
b8bd76b7cb
Merge "Revert "Revert "Adding e4crypt support"""
2015-04-02 14:49:25 +00:00
Paul Lawrence
c410b3bd63
Revert "Revert "Adding e4crypt support""
...
Fix build break caused by original change
This reverts commit 84b0bab58f
.
(cherry picked from commit bbb4c85bdcc9a1bce315ed9d61a228bb1b992a1c)
Change-Id: If0ead0f2656b69f33f72c64b03a05784455a4143
2015-04-01 13:48:06 -07:00
Jeff Sharkey
25775e8e63
Different blkid and fsck execution domains.
...
Tell vold about which SELinux domains to use for different classes
of devices. Also create a directory for vold to store private
files.
Bug: 19993667
Change-Id: Ib7bc80234f2b13a89b143bf90f147140109570cd
2015-04-01 11:55:50 -07:00
Paul Lawrence
b8c9d273a0
Revert "Revert "Adding e4crypt support""
...
Fix build break caused by original change
This reverts commit 84b0bab58f
.
Change-Id: I99fbd7c3d1ed92db1f546033c8493bb71a327924
2015-03-31 13:02:13 -07:00