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

Move mac_permissions to etc/selinux

Browse Source 
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
This commit is contained in:
Jeff Vander Stoep
2017-03-10 16:01:19 -08:00
parent c6613f7206
commit d2820e4e89
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";