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

Commit e62ef4e1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in UidPermissionPolicy"

parents 561109f6 2e9e4b18

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)

        }
@@ -1071,7 +1073,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) {