commit b063fe384ff91f94f214726e8debbc57ea0ee187
author Treehugger Robot <treehugger-gerrit@google.com> Sat Mar 11 23:23:09 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 11 23:23:09 2017 +0000
tree a98c1289cb2901c99e9303f9f95a02b3a731899e
parent c25e2b79b11083dcbb82e610b8e544d63077db01
parent d2820e4e8913741ce5b34344ed37c7ced3cc2d96

Merge "Move mac_permissions to etc/selinux"

services/core/java/com/android/server/pm/SELinuxMMAC.java

diff --git a/services/core/java/com/android/server/pm/SELinuxMMAC.java b/services/core/java/com/android/server/pm/SELinuxMMAC.java
index 522c2e8..9a559ee 100644
--- a/services/core/java/com/android/server/pm/SELinuxMMAC.java
+++ b/services/core/java/com/android/server/pm/SELinuxMMAC.java
@@ -60,8 +60,8 @@
 
     /** Path to MAC permissions on system image */
     private static final File[] MAC_PERMISSIONS =
-    { new File(Environment.getRootDirectory(), "/etc/security/plat_mac_permissions.xml"),
-      new File(Environment.getRootDirectory(), "/etc/security/nonplat_mac_permissions.xml") };
+    { new File(Environment.getRootDirectory(), "/etc/selinux/plat_mac_permissions.xml"),
+      new File(Environment.getVendorDirectory(), "/etc/selinux/nonplat_mac_permissions.xml") };
 
     // Append privapp to existing seinfo label
     private static final String PRIVILEGED_APP_STR = ":privapp";