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

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

Change-Id: Iafd4a16dc18fae46f900b57a0d8d277d830c30ec
This commit is contained in:
Treehugger Robot
2021-12-21 15:23:05 +00:00
committed by Automerger Merge Worker
parent 6afaa06a05 b49a354cfd
commit a76638e402
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

@@ -124,16 +124,10 @@ public final class SELinuxMMAC {
} }
// Vendor mac permissions. // 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( final File vendorMacPermission = new File(
Environment.getVendorDirectory(), "/etc/selinux/vendor_mac_permissions.xml"); Environment.getVendorDirectory(), "/etc/selinux/vendor_mac_permissions.xml");
if (vendorMacPermission.exists()) { if (vendorMacPermission.exists()) {
sMacPermissions.add(vendorMacPermission); sMacPermissions.add(vendorMacPermission);
} else {
// For backward compatibility.
sMacPermissions.add(new File(Environment.getVendorDirectory(),
"/etc/selinux/nonplat_mac_permissions.xml"));
} }
// ODM mac permissions (optional). // ODM mac permissions (optional).