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

Merge "Remove reference to nonplat sepolicy" am: d62f9054e8 am: b49a354cfd am: a76638e402 am: 34560f945d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1930822

Change-Id: I0aaa83feb4937d6b7dfa016cfd62b0fa8f51c8e7
This commit is contained in:
Treehugger Robot
2021-12-21 15:51:18 +00:00
committed by Automerger Merge Worker
parent 2c84c29d3d 34560f945d
commit 3eb8d7f0c1
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,16 +125,10 @@ public final class SELinuxMMAC {
}
// Vendor mac permissions.
// The filename has been renamed from nonplat_mac_permissions to
// vendor_mac_permissions. Either of them should exist.
final File vendorMacPermission = new File(
Environment.getVendorDirectory(), "/etc/selinux/vendor_mac_permissions.xml");
if (vendorMacPermission.exists()) {
sMacPermissions.add(vendorMacPermission);
} else {
// For backward compatibility.
sMacPermissions.add(new File(Environment.getVendorDirectory(),
"/etc/selinux/nonplat_mac_permissions.xml"));
}
// ODM mac permissions (optional).