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 am: 43d5e3bb62 am: 929c2c5e1b

Browse Source 
Change-Id: I59ffea6df5c62eb899b3603c8767318e96af195a
This commit is contained in:
Automerger Merge Worker
2020-01-09 01:50:54 +00:00
parent d6f29b2711 929c2c5e1b
commit 0cf089521a
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

@@ -22604,9 +22604,9 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
mSettings.writeKernelMappingLPr(ps);
}
final UserManager um = mContext.getSystemService(UserManager.class);
final UserManagerService um = sUserManager;
UserManagerInternal umInternal = getUserManagerInternal();
for (UserInfo user : um.getUsers()) {
for (UserInfo user : um.getUsers(false /* excludeDying */)) {
final int flags;
if (umInternal.isUserUnlockingOrUnlocked(user.id)) {
flags = StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE;