From d2820e4e8913741ce5b34344ed37c7ced3cc2d96 Mon Sep 17 00:00:00 2001 From: Jeff Vander Stoep Date: Fri, 10 Mar 2017 16:01:19 -0800 Subject: [PATCH] Move mac_permissions to etc/selinux Test: Build and boot Marlin Test: See the following in the logs: 01-01 02:10:28.756 1345 1345 D SELinuxMMAC: Using policy file /system/etc/selinux/plat_mac_permissions.xml 01-01 02:10:28.787 1345 1345 D SELinuxMMAC: Using policy file /vendor/etc/selinux/nonplat_mac_permissions.xml Bug: 36003167 Change-Id: I97479260eabe14c1b1dcc238d7322016f6b5c4dd --- services/core/java/com/android/server/pm/SELinuxMMAC.java | 4 ++-- 1 file 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 522c2e83a9ae7..9a559ee3afa15 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";