Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move mac_permissions to etc/selinux"

Browse Source 
am: b063fe384f

Change-Id: Ia6da81ff48e749c8d3f4f150e81fc0c138e7763e
This commit is contained in:
Jeff Vander Stoep
2017-03-11 23:30:01 +00:00
committed by android-build-merger
parent aa72261023 b063fe384f
commit 1376b937ed
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/SELinuxMMAC.java
View File

@@ -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";