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

Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into oc-dev am: e422bc0c8f

Browse Source 
Change-Id: I7efbfda4517e46abf406fd53487836704a941a2e
This commit is contained in:
Automerger Merge Worker
2020-01-09 00:08:31 +00:00
parent e580843476 e422bc0c8f
commit 43d5e3bb62
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

@@ -23511,9 +23511,9 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
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;