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

Commit 2e9e4b18 authored by Yi-an Chen's avatar Yi-an Chen
Browse files

Fix NPE in UidPermissionPolicy 

Bug: 263504888
Test: Build
Change-Id: I6e4baa4527d3c06772d18f936f6cbf161b15a663
parent ff73f8b3

services/permission/java/com/android/server/permission/access/permission/UidPermissionPolicy.kt

+4 −2
Original line number Diff line number Diff line
@@ -196,7 +196,9 @@ class UidPermissionPolicy : SchemePolicy() { 


        val changedPermissionNames = IndexedSet<String>()

        trimPermissions(packageName, changedPermissionNames)

        if (appId in newState.systemState.appIds) {

            trimPermissionStates(appId)

        }

        changedPermissionNames.forEachIndexed { _, permissionName ->

            evaluatePermissionStateForAllPackages(permissionName, null)

        }
@@ -1066,7 +1068,7 @@ class UidPermissionPolicy : SchemePolicy() { 
        state: AccessState = newState,

        action: (PackageState) -> Unit

    ) {

        val packageNames = state.systemState.appIds[appId]

        val packageNames = state.systemState.appIds[appId]!!

        packageNames.forEachIndexed { _, packageName ->

            val packageState = state.systemState.packageStates[packageName]!!

            if (packageState.androidPackage != null) {