commit 97de3e8c46f0e99f7578f0d960e7a63478fd580d
author The Android Automerger <android-build@android.com> Mon Apr 29 05:56:19 2013 -0700
committer The Android Automerger <android-build@android.com> Mon Apr 29 05:56:19 2013 -0700
tree 20b7da047484aa8f37c10156a29c51e103e49b3c
parent 538b5d4e8e4c480b2120aa957fe3e11a2836a1b3
parent c0a29aeb85343ec746031cbb984b9e48d3b60399

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

init/property_service.c

diff --git a/init/property_service.c b/init/property_service.c
index 5780001..3248399 100755
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -91,6 +91,7 @@
     { "persist.service.", AID_SYSTEM,   0 },
     { "persist.security.", AID_SYSTEM,   0 },
     { "persist.service.bdroid.", AID_BLUETOOTH,   0 },
+    { "persist.selinux.enforcing", AID_SYSTEM,  0},
     { "selinux."         , AID_SYSTEM,   0 },
     { NULL, 0, 0 }
 };

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index f7fe6f3..854af44 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -413,6 +413,12 @@
     restart ueventd
     restart installd
 
+on property:persist.selinux.enforcing=1
+    setenforce 1
+
+on property:persist.selinux.enforcing=0
+    setenforce 0
+
 service console /system/bin/sh
     class core
     console