commit bb393d68e4dbb5334c3b3984ef2020e0cfc7e790
author gcondra@google.com <gcondra@google.com> Fri Apr 26 13:37:51 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 26 13:37:51 2013 -0700
tree 2de44e04b8e6e7c4843ec8447fb4ce67c0d2f006
parent 032d8e3890335e96b16bfa3fbd7706fbb0f2d2c0
parent 0b063188054e8d1843f19325063349529494e29d

am 0b063188: Merge "Set persistent property for SELinux enforcement on update." into jb-mr2-dev

* commit '0b063188054e8d1843f19325063349529494e29d':
  Set persistent property for SELinux enforcement on update.

services/java/com/android/server/updates/SELinuxPolicyInstallReceiver.java

diff --git a/services/java/com/android/server/updates/SELinuxPolicyInstallReceiver.java b/services/java/com/android/server/updates/SELinuxPolicyInstallReceiver.java
index e8337f6..0ab86e4 100644
--- a/services/java/com/android/server/updates/SELinuxPolicyInstallReceiver.java
+++ b/services/java/com/android/server/updates/SELinuxPolicyInstallReceiver.java
@@ -122,9 +122,16 @@
     }
 
     private void setEnforcingMode(Context context) {
-        boolean mode = Settings.Global.getInt(context.getContentResolver(),
-            Settings.Global.SELINUX_STATUS, 0) == 1;
-        SELinux.setSELinuxEnforce(mode);
+        String mode = Settings.Global.getString(context.getContentResolver(),
+            Settings.Global.SELINUX_STATUS);
+        if (mode.equals("1")) {
+            Slog.i(TAG, "Setting enforcing mode");
+            SystemProperties.set("persist.selinux.enforcing", mode);
+        } else if (mode.equals("0")) {
+            Slog.i(TAG, "Tried to set permissive mode, ignoring");
+        } else {
+            Slog.e(TAG, "Got invalid enforcing mode: " + mode);
+        }
     }
 
     @Override