From 1d508c8155bebf525ff67ad11bd2c1f29560e7a3 Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Sat, 4 Feb 2023 00:44:42 +0000
Subject: Fix apexModuleName in getPrivilegedPermissionAllowlistState().

Bug: 266163702
Change-Id: I6e682afb36d29aa649bad5c23a4c06d6f20642c4
Test: presubmit
---
 .../server/permission/access/permission/UidPermissionPolicy.kt       | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'services/permission/java')

diff --git a/services/permission/java/com/android/server/permission/access/permission/UidPermissionPolicy.kt b/services/permission/java/com/android/server/permission/access/permission/UidPermissionPolicy.kt
index 02da25de20f1..a53aeb8388ae 100644
--- a/services/permission/java/com/android/server/permission/access/permission/UidPermissionPolicy.kt
+++ b/services/permission/java/com/android/server/permission/access/permission/UidPermissionPolicy.kt
@@ -1001,10 +1001,7 @@ class UidPermissionPolicy : SchemePolicy() {
         permissionName: String
     ): Boolean? {
         val permissionAllowlist = newState.systemState.permissionAllowlist
-        val apexModuleName = permissionAllowlist.apexPrivilegedAppAllowlists
-            .firstNotNullOfOrNullIndexed { _, apexModuleName, apexAllowlist ->
-                if (packageState.apexModuleName in apexAllowlist) apexModuleName else null
-            }
+        val apexModuleName = packageState.apexModuleName
         val packageName = packageState.packageName
         return when {
             packageState.isVendor -> permissionAllowlist.getVendorPrivilegedAppAllowlistState(
-- 
cgit v1.2.3-59-g8ed1b