Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in UidPermissionPolicy"

Browse Source
This commit is contained in:
TreeHugger Robot
2023-02-04 01:26:29 +00:00
committed by Android (Google) Code Review
parent 561109f6d4 2e9e4b1820
commit e62ef4e15d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/permission/java/com/android/server/permission/access/permission/UidPermissionPolicy.kt
View File

@@ -196,7 +196,9 @@ class UidPermissionPolicy : SchemePolicy() {
val changedPermissionNames = IndexedSet<String>()
trimPermissions(packageName, changedPermissionNames)
trimPermissionStates(appId)
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) {