commit 1e47a7466868ff90f6afa2d20d1b209b7b8fcfae
author gcondra@google.com <gcondra@google.com> Mon May 20 16:35:35 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon May 20 16:35:35 2013 -0700
tree 66304670491c393edabd37cabf1d5a04c0c57ed9
parent acef650dbc11355f9792923b69d8277a4ce89fab
parent 253e91b4ffb631b188fdac0c1624786103471f05

am 253e91b4: am 477e35d6: Revert "Add persistent property for SELinux enforcment status."

* commit '253e91b4ffb631b188fdac0c1624786103471f05':
  Revert "Add persistent property for SELinux enforcment status."

init/property_service.c

diff --git a/init/property_service.c b/init/property_service.c
index 10be3f5..c5903df 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -92,7 +92,6 @@
     { "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 09017af..74efd68 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -413,12 +413,6 @@
     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