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

DO NOT MERGE: Fixes NPE when preparing app data during init

Browse Source 
am: 1e5261ce6f

Change-Id: Ie96abe8d388a6b8f147ea2d75ddf32d64814bc35
This commit is contained in:
Patrick Baumann
2019-12-03 08:34:24 -08:00
committed by android-build-merger
parent 3fad35fa15 1e5261ce6f
commit 2ef1824050
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -22376,9 +22376,9 @@ public class PackageManagerService extends IPackageManager.Stub
mSettings.writeKernelMappingLPr(ps); mSettings.writeKernelMappingLPr(ps);
} }
final UserManager um = mContext.getSystemService(UserManager.class); final UserManagerService um = sUserManager;
UserManagerInternal umInternal = getUserManagerInternal(); UserManagerInternal umInternal = getUserManagerInternal();
for (UserInfo user : um.getUsers()) { for (UserInfo user : um.getUsers(false /* excludeDying */)) {
final int flags; final int flags;
if (umInternal.isUserUnlockingOrUnlocked(user.id)) { if (umInternal.isUserUnlockingOrUnlocked(user.id)) {
flags = StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE; flags = StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE;