From 1378981fc7612fff1f96ef8ce4b7bf626e1fb3a2 Mon Sep 17 00:00:00 2001
From: Inseob Kim <inseob@google.com>
Date: Tue, 21 Dec 2021 13:48:57 +0900
Subject: [PATCH] Remove reference to nonplat sepolicy

nonplat isn't supported since Android P.

Bug: 210536608
Test: build and boot
Change-Id: I90102358265c7de1aad34792fdfacddf1e5a0a04
---
 services/core/java/com/android/server/pm/SELinuxMMAC.java | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/services/core/java/com/android/server/pm/SELinuxMMAC.java b/services/core/java/com/android/server/pm/SELinuxMMAC.java
index 4a913e4edd712..cecbeed67f681 100644
--- a/services/core/java/com/android/server/pm/SELinuxMMAC.java
+++ b/services/core/java/com/android/server/pm/SELinuxMMAC.java
@@ -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).