Update location of policy files

The location of policy files has changed from
/data/system to /data/security.

Also, a name change to mmac enforcing property
name to place it under persist.mmac. namesepace.

Adds api's for getting and setting the MMAC
enforcing mode.

Change-Id: I0e9468fe651cd6ec018d5c85d35d693e55479e89

1 files changed, 20 insertions, 3 deletions

diff --git a/core/java/android/content/pm/SELinuxMMAC.java b/core/java/android/content/pm/SELinuxMMAC.java
index 38f19b6..5b85adb 100644
--- a/core/java/android/content/pm/SELinuxMMAC.java
+++ b/core/java/android/content/pm/SELinuxMMAC.java
@@ -49,7 +49,7 @@ public final class SELinuxMMAC {
 
     private static final String TAG = "SELinuxMMAC";
     private static final String MMAC_DENY = "MMAC_DENIAL:";
-
+    private static final String MMAC_ENFORCE_PROPERTY = "persist.mmac.enforce";
     private static final boolean DEBUG_POLICY = true;
     private static final boolean DEBUG_POLICY_INSTALL = DEBUG_POLICY || false;
 
@@ -63,7 +63,7 @@ public final class SELinuxMMAC {
 
     // Locations of potential install policy files.
     private static final File[] INSTALL_POLICY_FILE = {
-        new File(Environment.getDataDirectory(), "system/mac_permissions.xml"),
+        new File(Environment.getDataDirectory(), "security/mac_permissions.xml"),
         new File(Environment.getRootDirectory(), "etc/security/mac_permissions.xml"),
         null};
 
@@ -83,6 +83,23 @@ public final class SELinuxMMAC {
     }
 
     /**
+     * Returns the current status of MMAC enforcing mode.
+     * @param none
+     * @return boolean indicating whether or not the device is in enforcing mode.
+     */
+    public static boolean getEnforcingMode() {
+        return SystemProperties.getBoolean(MMAC_ENFORCE_PROPERTY, false);
+    }
+
+    /**
+     * Returns the current status of MMAC enforcing mode.
+     * @param boolean value to set the enforcing state too.
+     */
+    public static void setEnforcingMode(boolean value) {
+        SystemProperties.set(MMAC_ENFORCE_PROPERTY, value ? "1" : "0");
+    }
+
+    /**
      * Parses an MMAC install policy given as an argument.
      * @param File object representing the path of the policy.
      * @return boolean indicating whether the install policy was correctly parsed.
@@ -113,7 +130,7 @@ public final class SELinuxMMAC {
 
         Slog.d(TAG, "MMAC install enabled using file " + policyFiles[i].getPath());
 
-        boolean enforcing = SystemProperties.getBoolean("persist.mac_enforcing_mode", false);
+        boolean enforcing = getEnforcingMode();
         String mode = enforcing ? "enforcing" : "permissive";
         Slog.d(TAG, "MMAC install starting in " + mode + " mode.");