Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d62f9054 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove reference to nonplat sepolicy"

parents 83795620 1378981f

services/core/java/com/android/server/pm/SELinuxMMAC.java

+0 −6
Original line number Diff line number Diff line
@@ -124,16 +124,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).