17775724b8
am 5cb9a02b: am 7e723498: Merge "Add permission for bluetooth app in non-primary users" into jb-mr2-dev
...
* commit '5cb9a02b0322c18b48eb9ce261502c3b830c113c':
Add permission for bluetooth app in non-primary users
2013-05-22 10:41:26 -07:00
5cb9a02b03
am 7e723498: Merge "Add permission for bluetooth app in non-primary users" into jb-mr2-dev
...
* commit '7e72349865db83d62f98eec8bca4b170712fe0e0':
Add permission for bluetooth app in non-primary users
2013-05-22 10:38:44 -07:00
7e72349865
Merge "Add permission for bluetooth app in non-primary users" into jb-mr2-dev
2013-05-22 17:36:53 +00:00
40a91a2884
Add permission for bluetooth app in non-primary users
...
bug 8954114
Change-Id: Id6a42f5a5beefa22c3cc8eecfb39a2222017a3b4
2013-05-22 10:00:23 -07:00
a022ce7c80
am 8f6adcfc: am 49be2407: Revert "Add logic to fixup file contexts after a policy update."
...
* commit '8f6adcfcc55414cc07c18fe47d7c4314da148544':
Revert "Add logic to fixup file contexts after a policy update."
2013-05-20 16:35:35 -07:00
1e47a74668
am 253e91b4: am 477e35d6: Revert "Add persistent property for SELinux enforcment status."
...
* commit '253e91b4ffb631b188fdac0c1624786103471f05':
Revert "Add persistent property for SELinux enforcment status."
2013-05-20 16:35:35 -07:00
acef650dbc
am 43329bc1: am 8a387870: Revert "Reload policy after setting up the data partition."
...
* commit '43329bc1c99c0f5f3670a8aaab39e54df34819a1':
Revert "Reload policy after setting up the data partition."
2013-05-20 16:35:34 -07:00
104c33992f
am f5410f2b: am 3d32cd93: Revert "Remove /system from the dirs to relabel."
...
* commit 'f5410f2bde6fd5295cad36e3ba3efba0beb92780':
Revert "Remove /system from the dirs to relabel."
2013-05-20 16:35:34 -07:00
9a8cb3abf8
am b9866649: am 52351300: Revert "Add a version check for SELinux policy on device."
...
* commit 'b9866649e24d7b6eedcaf2e03ffc605a3417537d':
Revert "Add a version check for SELinux policy on device."
2013-05-20 16:35:33 -07:00
8f6adcfcc5
am 49be2407: Revert "Add logic to fixup file contexts after a policy update."
...
* commit '49be240735a06f44e1d91aa51dd299779ad36d96':
Revert "Add logic to fixup file contexts after a policy update."
2013-05-20 15:52:28 -07:00
253e91b4ff
am 477e35d6: Revert "Add persistent property for SELinux enforcment status."
...
* commit '477e35d6d56c7fe9b2305becdf3ed4f590ddfbd6':
Revert "Add persistent property for SELinux enforcment status."
2013-05-20 15:52:28 -07:00
43329bc1c9
am 8a387870: Revert "Reload policy after setting up the data partition."
...
* commit '8a3878700eb9cd8ecf495cd01f15face5c3879c8':
Revert "Reload policy after setting up the data partition."
2013-05-20 15:52:27 -07:00
f5410f2bde
am 3d32cd93: Revert "Remove /system from the dirs to relabel."
...
* commit '3d32cd938746215e5fa9b1a3c3b78903e043ae73':
Revert "Remove /system from the dirs to relabel."
2013-05-20 15:52:27 -07:00
b9866649e2
am 52351300: Revert "Add a version check for SELinux policy on device."
...
* commit '52351300d156826bf22c493828571f45a1cea16a':
Revert "Add a version check for SELinux policy on device."
2013-05-20 15:52:26 -07:00
49be240735
Revert "Add logic to fixup file contexts after a policy update."
...
This reverts commit ebcf93e3bf
2013-05-17 12:48:34 -07:00
477e35d6d5
Revert "Add persistent property for SELinux enforcment status."
...
This reverts commit b89bdfde42
2013-05-17 12:48:18 -07:00
8a3878700e
Revert "Reload policy after setting up the data partition."
...
This reverts commit fee250d27a
2013-05-17 12:47:04 -07:00
3d32cd9387
Revert "Remove /system from the dirs to relabel."
...
This reverts commit 3d4d07b2fa
2013-05-17 12:46:31 -07:00
52351300d1
Revert "Add a version check for SELinux policy on device."
...
This reverts commit 921be8b656
2013-05-17 12:46:00 -07:00
e45710f19f
am 5a98566d: am 921be8b6: Add a version check for SELinux policy on device.
...
* commit '5a98566d589408c78e35f4476f478a2fa1c13e78':
Add a version check for SELinux policy on device.
2013-05-14 23:45:59 -07:00
5a98566d58
am 921be8b6: Add a version check for SELinux policy on device.
...
* commit '921be8b6568df0057c4eacbac2e1022b71e09620':
Add a version check for SELinux policy on device.
2013-05-14 23:43:56 -07:00
921be8b656
Add a version check for SELinux policy on device.
...
This helps to ensure that when a new system image is installed,
old userdata policy isn't applied over the top of it.
Bug: 8841348
Change-Id: I135af32250aa62979763e775842ce0af3c8b6f9f
2013-05-14 21:05:03 -07:00
2fd3cc4c0f
am ac5cf925: am 683aa89b: Merge "Remove /system from the dirs to relabel." into jb-mr2-dev
...
* commit 'ac5cf925f86706d2bf89948e7cd3379376185d3b':
Remove /system from the dirs to relabel.
2013-05-08 15:04:02 -07:00
ac5cf925f8
am 683aa89b: Merge "Remove /system from the dirs to relabel." into jb-mr2-dev
...
* commit '683aa89bfdf2439d1c5d9a4dc240d6a673678a98':
Remove /system from the dirs to relabel.
2013-05-07 19:19:50 -07:00
3d4d07b2fa
Remove /system from the dirs to relabel.
...
Bug: 8841348
Change-Id: Ia1545288e8a8184feffaaa6158faad62f95cbcce
2013-05-07 19:05:08 -07:00
72b1ffd375
am 803eda6a: am f69cc564: Merge "Update ueventd set the SELinux context on sysfs"
...
* commit '803eda6a2dfcb50f61dd4a6a616e560a87453cb0':
Update ueventd set the SELinux context on sysfs
2013-04-30 21:13:47 -07:00
51ef5882e7
am 55d69a96: am 032be7a4: Merge "Log an error if property pool is exhausted"
...
* commit '55d69a9681061b97d6bdcc0b1b92a7de63d0a07b':
Log an error if property pool is exhausted
2013-04-30 21:13:46 -07:00
803eda6a2d
am f69cc564: Merge "Update ueventd set the SELinux context on sysfs"
...
* commit 'f69cc564f4129ad7f223bb7d83ebec9fe3438b62':
Update ueventd set the SELinux context on sysfs
2013-04-30 21:12:28 -07:00
55d69a9681
am 032be7a4: Merge "Log an error if property pool is exhausted"
...
* commit '032be7a4c5be8c015063084d162d1f394279aa3d':
Log an error if property pool is exhausted
2013-04-30 21:12:28 -07:00
f69cc564f4
Merge "Update ueventd set the SELinux context on sysfs"
2013-05-01 03:48:41 +00:00
efbe7fc6cc
am 63577d92: am fee250d2: Reload policy after setting up the data partition.
...
* commit '63577d9280e7919bfb7221030d211b833e66bb1e':
Reload policy after setting up the data partition.
2013-04-30 17:18:05 -07:00
63577d9280
am fee250d2: Reload policy after setting up the data partition.
...
* commit 'fee250d27a9c03af1ba439047b976d89563b1887':
Reload policy after setting up the data partition.
2013-04-30 17:04:53 -07:00
fee250d27a
Reload policy after setting up the data partition.
...
This forces a policy reload + fixcon to deal with dynamically
delivered policy changing labels on device nodes.
It's implemented as a new keyword in init.
Bug: 8702843
Change-Id: I803cf1ecf6ff8318ce25dcc5cda4f292adc9738c
2013-04-30 11:40:22 -07:00
fd7ffb1089
Log an error if property pool is exhausted
...
Failing to set properties due to an exhausted pool leads
to difficult to debug problems. This change adds an
error log to make the situation a bit easier to handle.
Change-Id: Icc1d97a80882fb23e74428a0195f1d28dba68fa8
2013-04-29 13:07:40 +02:00
ada3291c8d
am 14ad7861: am 538b5d4e: Merge "Add persistent property for SELinux enforcment status." into jb-mr2-dev
...
* commit '14ad786183455ad9c8298e24946d4da0f24458d7':
Add persistent property for SELinux enforcment status.
2013-04-26 13:39:40 -07:00
14ad786183
am 538b5d4e: Merge "Add persistent property for SELinux enforcment status." into jb-mr2-dev
...
* commit '538b5d4e8e4c480b2120aa957fe3e11a2836a1b3':
Add persistent property for SELinux enforcment status.
2013-04-26 13:37:52 -07:00
b89bdfde42
Add persistent property for SELinux enforcment status.
...
Also adds triggers for going between enforcing and
permissive status.
Bug: 8702843
Change-Id: I841d80999b96acf6b6fd0a5408fb074952d6ae72
2013-04-25 14:19:16 -07:00
ca8e66a8b0
Make init handle reboots
...
Move the responsibility for rebooting the system from the
reboot command to init. Init is in a better position to take
actions to bring the system down cleanly, including making sure
filesystems are mounted read-only.
The only UIDs which can perform an init triggered reboot are
root, system, and shell.
Modify the reboot command so that it calls into init to perform
the reboot. The reboot command no longer requires CAP_SYS_BOOT.
Remove the -n reboot option and code which supports it. Anyone needing
to do an unclean shutdown can just do a 'echo c > /proc/sysrq-trigger'.
Modify adb so that it calls into init to perform a shutdown.
Bug: 8646621
Change-Id: I84c0513acb549720cb0e8c9fcbda0050f5c396f5
2013-04-23 13:21:40 -07:00
7e25fa1859
am ebcf93e3: Add logic to fixup file contexts after a policy update.
...
* commit 'ebcf93e3bf92bf46c54c8e0f2ec8936bb2db6aea':
Add logic to fixup file contexts after a policy update.
2013-04-15 16:13:53 -07:00
ebcf93e3bf
Add logic to fixup file contexts after a policy update.
...
Bug: 8116902
(cherry picked from commit 47677a506f
2013-04-15 14:59:42 -07:00
dbdd280ea6
Merge "Add logic to fixup file contexts after a policy update."
2013-04-15 21:34:07 +00:00
47677a506f
Add logic to fixup file contexts after a policy update.
...
Bug: 8116902
Change-Id: Ifa1785c75a24a9b3cfcb700f22ded7d16a917f79
2013-04-15 13:16:38 -07:00
d45dcbd5f8
am 1a6d9ec2: Merge "fs_mgr: Capture the output of e2fsck and add to the kernel log" into jb-mr2-dev
...
* commit '1a6d9ec2af7b3151c64a167162c87d258d30735b':
fs_mgr: Capture the output of e2fsck and add to the kernel log
2013-04-15 10:35:32 -07:00
bf021b4cd7
fs_mgr: Capture the output of e2fsck and add to the kernel log
...
Currently, the output of e2fsck is not saved, and we have no insight
into how many errors e2fsck is finding and fixing. Using the new
abbreviated logging feature in liblogwrap, up to the first 100 lines,
and last 4K bytes of the output of e2fsck is captured by fs_mgr, and
added to the kernel log.
Usually, the filesystem will be clean, and this will only add a few
lines to the kernel log on boot, but when things go wrong, it should
save enough to indicate what the problem is, without potentially
filling the kernel log with only e2fsck output if the filesystem is
really corrupted.
Change-Id: I9c264798e6fe721c8f818b5ce15d0975027ddbdd
2013-04-14 17:11:00 -07:00
a5ca229a45
am 1615c09a: Merge "init: Fix potential null pointer issue"
...
* commit '1615c09ac1065104f56ddc444f5467aff76c0daa':
init: Fix potential null pointer issue
2013-04-05 19:56:27 -07:00
b4d52a437e
Only handle keycodes when adb is enabled.
...
This prevents accidental bugreports on userdebug/eng devices.
Bug: 8541006
Change-Id: Iefd15826090fd91434403f197cfd166e64400224
2013-04-04 10:46:33 -07:00
5f7b017f41
Update ueventd set the SELinux context on sysfs
...
This change enables labeling of dynamically created sysfs nodes
with specific SELinux security contexts.
Change-Id: If8b8d66120453123c1371ce063b6f20e8b96b6ef
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-04-03 17:44:19 -07:00
8e15eabdc0
Apply the correct SELinux label for the properties workspace.
...
Change-Id: Ibb9c8044caa9d39ee6ec9fe06d54bb9dc4b56ff3
2013-04-03 11:59:56 -07:00
11467189bc
init: Fix potential null pointer issue
...
With the old strdup() mechanism, it may return NULL if insufficient memory was
available. So we check the return value or do not use strdup to avoid null
pointer issue.
Change-Id: Id684948d6cb6c2f06327f29a2ba692f9542fce80
Signed-off-by: Hong-Mei Li <a21834@motorola.com>
2013-04-01 11:17:51 +08:00
de97f798a1
am bed08333: am c0e1bc1c: Merge "Drop /data/system as a policy file location"
...
* commit 'bed08333d921e97bc60b81c0f183816386709d79':
Drop /data/system as a policy file location
2013-03-27 16:42:21 -07:00
Matthew Xie