Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43d5e3bb authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: I7efbfda4517e46abf406fd53487836704a941a2e
parents e5808434 e422bc0c

services/core/java/com/android/server/pm/PackageManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -23511,9 +23511,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;