commit f2661be2157fd81e0306f0c8c1a928b13358dc4d
author The Android Automerger <android-build@android.com> Thu Apr 04 05:56:12 2013 -0700
committer The Android Automerger <android-build@android.com> Thu Apr 04 05:56:12 2013 -0700
tree 995a832128283eae16e82e25c91b298462df3d45
parent c1e47294c9ca69f32bae24036eb0f19db3af7b2e
parent f135302f31320c3753f9e08ed80b64f567e93a82

merge in jb-mr2-release history after reset to jb-mr2-dev

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 e6583e3..89ec18a 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