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

Merge "Add /product sepolicy support to SELinuxMMAC.java"

Browse Source 
am: f3a8a47d61

Change-Id: I232a57eb549dd72572bd0f347d62fdbdbdd00668
This commit is contained in:
Tri Vo
2019-01-08 20:54:58 -08:00
committed by android-build-merger
parent 2ff175569a f3a8a47d61
commit 2ff8fbf18c
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,8 +17,8 @@
package com.android.server.pm; package com.android.server.pm;
import android.content.pm.PackageParser; import android.content.pm.PackageParser;
import android.content.pm.Signature;
import android.content.pm.PackageParser.SigningDetails; import android.content.pm.PackageParser.SigningDetails;
import android.content.pm.Signature;
import android.os.Environment; import android.os.Environment;
import android.util.Slog; import android.util.Slog;
import android.util.Xml; import android.util.Xml;
@@ -81,6 +81,13 @@ public final class SELinuxMMAC {
sMacPermissions.add(new File( sMacPermissions.add(new File(
Environment.getRootDirectory(), "/etc/selinux/plat_mac_permissions.xml")); Environment.getRootDirectory(), "/etc/selinux/plat_mac_permissions.xml"));
// Product mac permissions (optional).
final File productMacPermission = new File(
Environment.getProductDirectory(), "/etc/selinux/product_mac_permissions.xml");
if (productMacPermission.exists()) {
sMacPermissions.add(productMacPermission);
}
// Vendor mac permissions. // Vendor mac permissions.
// The filename has been renamed from nonplat_mac_permissions to // The filename has been renamed from nonplat_mac_permissions to
// vendor_mac_permissions. Either of them should exist. // vendor_mac_permissions. Either of them should exist.