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

Commit a76638e4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove reference to nonplat sepolicy" am: d62f9054 am: b49a354c 

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

Change-Id: Iafd4a16dc18fae46f900b57a0d8d277d830c30ec
parents 6afaa06a b49a354c

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

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