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

Commit 87d7628b authored by Winson Chiu's avatar Winson Chiu Committed by Automerger Merge Worker
Browse files

Merge "Revert "Use StorageManager#isUserKeyUnlocked to determine CE storage in... 

Merge "Revert "Use StorageManager#isUserKeyUnlocked to determine CE storage in PMS"" into sc-dev am: b8787c6f am: f4f91bf2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561924

Change-Id: I049366b19aa4f2b91bb1a62e31ef910752ece1fc
parents da3135ea f4f91bf2

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

+4 −4
Original line number Diff line number Diff line
@@ -18712,7 +18712,7 @@ public class PackageManagerService extends IPackageManager.Stub 














        UserManagerInternal umInternal = mInjector.getUserManagerInternal();















        final int flags;













        if (StorageManager.isUserKeyUnlocked(userId)) {













        if (umInternal.isUserUnlockingOrUnlocked(userId)) {















            flags = StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE;















        } else if (umInternal.isUserRunning(userId)) {















            flags = StorageManager.FLAG_STORAGE_DE;










@@ -21505,7 +21505,7 @@ public class PackageManagerService extends IPackageManager.Stub













        UserManagerInternal umInternal = mInjector.getUserManagerInternal();















        for (UserInfo user : mUserManager.getUsers(false /* includeDying */)) {















            final int flags;













            if (StorageManager.isUserKeyUnlocked(user.id)) {













            if (umInternal.isUserUnlockingOrUnlocked(user.id)) {















                flags = StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE;















            } else if (umInternal.isUserRunning(user.id)) {















                flags = StorageManager.FLAG_STORAGE_DE;










@@ -21845,7 +21845,7 @@ public class PackageManagerService extends IPackageManager.Stub













        StorageManagerInternal smInternal = mInjector.getLocalService(StorageManagerInternal.class);















        for (UserInfo user : mUserManager.getUsers(false /*excludeDying*/)) {















            final int flags;













            if (StorageManager.isUserKeyUnlocked(user.id)) {













            if (umInternal.isUserUnlockingOrUnlocked(user.id)) {















                flags = StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE;















            } else if (umInternal.isUserRunning(user.id)) {















                flags = StorageManager.FLAG_STORAGE_DE;









@@ -21863,7 +21863,7 @@ public class PackageManagerService extends IPackageManager.Stub













                    // Note: this code block is executed with the Installer lock















                    // already held, since it's invoked as a side-effect of















                    // executeBatchLI()













                    if (StorageManager.isUserKeyUnlocked(user.id)) {













                    if (umInternal.isUserUnlockingOrUnlocked(user.id)) {















                        // Prepare app data on external storage; currently this is used to















                        // setup any OBB dirs that were created by the installer correctly.















                        int uid = UserHandle.getUid(user.id, UserHandle.getAppId(pkg.getUid()));