Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cfdf62e authored by Jeff Vander Stoep's avatar Jeff Vander Stoep Committed by android-build-merger
Browse files

Merge "Move mac_permissions to etc/selinux" am: b063fe38 am: 1376b937 

am: 7f963086

Change-Id: Ie90342ef543ed0803fc279adbfb3e919f6bf63d5
parents f031ca9f 7f963086

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

+2 −2
Original line number Diff line number Diff line
@@ -62,8 +62,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";