commit 5d0a0f151e465bc67ca655a05d937b933768c05c
author Bowgo Tsai <bowgotsai@google.com> Fri Sep 27 17:51:43 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Sep 27 17:51:43 2019 -0700
tree cc4891723c8dedbe319f70c78f5b06c68b7463d1
parent 7b5a8dfe4ac72df235e127c4a3cbfe9abc69d3ae
parent 62031438a785242ed6f0041b10273231162c8d78

Merge "Add /system_ext sepolicy support to SELinuxMMAC.java"
am: 62031438a7

Change-Id: Id09ffdb7f16a5b7886632ccf31a96ecc6243c9a7

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

diff --git a/services/core/java/com/android/server/pm/SELinuxMMAC.java b/services/core/java/com/android/server/pm/SELinuxMMAC.java
index b94047e..b464988 100644
--- a/services/core/java/com/android/server/pm/SELinuxMMAC.java
+++ b/services/core/java/com/android/server/pm/SELinuxMMAC.java
@@ -78,6 +78,13 @@
         sMacPermissions.add(new File(
             Environment.getRootDirectory(), "/etc/selinux/plat_mac_permissions.xml"));
 
+        // SystemExt mac permissions (optional).
+        final File systemExtMacPermission = new File(
+                Environment.getSystemExtDirectory(), "/etc/selinux/system_ext_mac_permissions.xml");
+        if (systemExtMacPermission.exists()) {
+            sMacPermissions.add(systemExtMacPermission);
+        }
+
         // Product mac permissions (optional).
         final File productMacPermission = new File(
                 Environment.getProductDirectory(), "/etc/selinux/product_mac_permissions.xml");