diff options
| author | 2017-03-11 23:23:09 +0000 | |
|---|---|---|
| committer | 2017-03-11 23:23:09 +0000 | |
| commit | b063fe384ff91f94f214726e8debbc57ea0ee187 (patch) | |
| tree | a98c1289cb2901c99e9303f9f95a02b3a731899e | |
| parent | c25e2b79b11083dcbb82e610b8e544d63077db01 (diff) | |
| parent | d2820e4e8913741ce5b34344ed37c7ced3cc2d96 (diff) | |
Merge "Move mac_permissions to etc/selinux"
| -rw-r--r-- | services/core/java/com/android/server/pm/SELinuxMMAC.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/SELinuxMMAC.java b/services/core/java/com/android/server/pm/SELinuxMMAC.java index 522c2e83a9ae..9a559ee3afa1 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 @@ public final class SELinuxMMAC { /** 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"; |