summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgcondra@google.com <gcondra@google.com>2013-05-20 15:52:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-20 15:52:28 -0700
commit253e91b4ffb631b188fdac0c1624786103471f05 (patch)
treeda2ad14ca1480b87b4b00f08599d77c82ce86b78
parent43329bc1c99c0f5f3670a8aaab39e54df34819a1 (diff)
parent477e35d6d56c7fe9b2305becdf3ed4f590ddfbd6 (diff)
downloadsystem_core-253e91b4ffb631b188fdac0c1624786103471f05.zip
system_core-253e91b4ffb631b188fdac0c1624786103471f05.tar.gz
system_core-253e91b4ffb631b188fdac0c1624786103471f05.tar.bz2
am 477e35d6: Revert "Add persistent property for SELinux enforcment status."
* commit '477e35d6d56c7fe9b2305becdf3ed4f590ddfbd6': Revert "Add persistent property for SELinux enforcment status."
-rwxr-xr-xinit/property_service.c1
-rw-r--r--rootdir/init.rc6
2 files changed, 0 insertions, 7 deletions
diff --git a/init/property_service.c b/init/property_service.c
index 0989e6d..c1be2e0 100755
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -91,7 +91,6 @@ struct {
{ "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 }
};
diff --git a/rootdir/init.rc b/rootdir/init.rc
index aec9e63..505c43f 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -413,12 +413,6 @@ on property:selinux.reload_policy=1
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