Merge "DO NOT MERGE Fix NPE in executeDeletePackageLIF." into rvc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
17d62ac4c7
@@ -19198,7 +19198,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);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user