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

Commit 9d3abfbf authored by Tri Vo's avatar Tri Vo Committed by android-build-merger
Browse files

Merge "Add /product sepolicy support to SELinuxMMAC.java" am: f3a8a47d am: 2ff8fbf1 

am: 59235cbf

Change-Id: I8eaebb94782af6e934964f80eb06581b582c2c3b
parents bd692981 59235cbf

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

+8 −1
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
package com.android.server.pm;



import android.content.pm.PackageParser;

import android.content.pm.Signature;

import android.content.pm.PackageParser.SigningDetails;

import android.content.pm.Signature;

import android.os.Environment;

import android.util.Slog;

import android.util.Xml;
@@ -81,6 +81,13 @@ public final class SELinuxMMAC { 
        sMacPermissions.add(new File(

            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.

        // The filename has been renamed from nonplat_mac_permissions to

        // vendor_mac_permissions. Either of them should exist.