diff options
| author | 2017-03-11 23:30:01 +0000 | |
|---|---|---|
| committer | 2017-03-11 23:30:01 +0000 | |
| commit | 1376b937ed5cc65c64a73487eb9935c9e3f3f46d (patch) | |
| tree | dff565ca0a74a5c5775cccba9dab66fd5e276322 | |
| parent | aa72261023d68d1fc3b79a853bc9b854d4b0b10a (diff) | |
| parent | b063fe384ff91f94f214726e8debbc57ea0ee187 (diff) | |
Merge "Move mac_permissions to etc/selinux"
am: b063fe384f
Change-Id: Ia6da81ff48e749c8d3f4f150e81fc0c138e7763e
| -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"; |