DO NOT MERGE Fix NPE in executeDeletePackageLIF. am: 01e0f4813a am: b2487b7862

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12495373

Change-Id: Ie4418e7ad6fbd917b84ca55cb5cf9584136555c0
This commit is contained in:
Hai Zhang
2020-09-03 22:25:20 +00:00
committed by Automerger Merge Worker

View File

@@ -19203,7 +19203,8 @@ public class PackageManagerService extends IPackageManager.Stub
// We need to get the permission state before package state is (potentially) destroyed. // We need to get the permission state before package state is (potentially) destroyed.
final SparseBooleanArray hadSuspendAppsPermission = new SparseBooleanArray(); final SparseBooleanArray hadSuspendAppsPermission = new SparseBooleanArray();
for (int userId : allUserHandles) { // allUserHandles could be null, so call mUserManager.getUserIds() directly which is cached anyway.
for (int userId : mUserManager.getUserIds()) {
hadSuspendAppsPermission.put(userId, checkPermission(Manifest.permission.SUSPEND_APPS, hadSuspendAppsPermission.put(userId, checkPermission(Manifest.permission.SUSPEND_APPS,
packageName, userId) == PERMISSION_GRANTED); packageName, userId) == PERMISSION_GRANTED);
} }