commit 76c674451c831c1e9c3e3ee134ea8af26ae19ac1
author Brian Carlstrom <bdc@google.com> Wed Apr 03 21:05:34 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 03 21:05:34 2013 +0000
tree ed7eefec7f3613c2f2f408012deb545ed0d0142a
parent 977e1f263cee9023baf12cb430b5547e415e763e
parent d3f0e0ae379f4420b01bb9de932a764c035ff2a6

Merge "resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aosp" into jb-mr2-dev-plus-aosp

init/init.c

diff --git a/init/init.c b/init/init.c
index b28b0ab..93b5997 100755
--- a/init/init.c
+++ b/init/init.c
@@ -879,6 +879,7 @@
      */
     restorecon("/dev");
     restorecon("/dev/socket");
+    restorecon("/dev/__properties__");
 
     is_charger = !strcmp(bootmode, "charger");
 

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index e8871c4..c3ef503 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -348,6 +348,10 @@
     chown system system /sys/kernel/ipv4/tcp_rmem_max
     chown root radio /proc/cmdline
 
+# Set these so we can remotely update SELinux policy
+    chown system system /sys/fs/selinux/load
+    chown system system /sys/fs/selinux/enforce
+
 # Define TCP buffer sizes for various networks
 #   ReadMin, ReadInitial, ReadMax, WriteMin, WriteInitial, WriteMax,
     setprop net.tcp.buffersize.default 4096,87380,110208,4096,16384,110208