Merge "Use StorageManager#isUserKeyUnlocked to determine CE storage in PMS" into sc-dev (6356acda) · Commits · e / os / android_frameworks_base

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

+4 −4

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

		UserManagerInternal umInternal = mInjector.getUserManagerInternal();
		final int flags;
		if (umInternal.isUserUnlockingOrUnlocked(userId)) {
		if (StorageManager.isUserKeyUnlocked(userId)) {
		flags = StorageManager.FLAG_STORAGE_DE \| StorageManager.FLAG_STORAGE_CE;
		} else if (umInternal.isUserRunning(userId)) {
		flags = StorageManager.FLAG_STORAGE_DE;
		@@ -25246,7 +25246,7 @@ public class PackageManagerService extends IPackageManager.Stub
		UserManagerInternal umInternal = mInjector.getUserManagerInternal();
		for (UserInfo user : mUserManager.getUsers(false /* includeDying */)) {
		final int flags;
		if (umInternal.isUserUnlockingOrUnlocked(user.id)) {
		if (StorageManager.isUserKeyUnlocked(user.id)) {
		flags = StorageManager.FLAG_STORAGE_DE \| StorageManager.FLAG_STORAGE_CE;
		} else if (umInternal.isUserRunning(user.id)) {
		flags = StorageManager.FLAG_STORAGE_DE;
		@@ -25586,7 +25586,7 @@ public class PackageManagerService extends IPackageManager.Stub
		StorageManagerInternal smInternal = mInjector.getLocalService(StorageManagerInternal.class);
		for (UserInfo user : mUserManager.getUsers(false /excludeDying/)) {
		final int flags;
		if (umInternal.isUserUnlockingOrUnlocked(user.id)) {
		if (StorageManager.isUserKeyUnlocked(user.id)) {
		flags = StorageManager.FLAG_STORAGE_DE \| StorageManager.FLAG_STORAGE_CE;
		} else if (umInternal.isUserRunning(user.id)) {
		flags = StorageManager.FLAG_STORAGE_DE;
		@@ -25600,7 +25600,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 (umInternal.isUserUnlockingOrUnlocked(user.id)) {
		if (StorageManager.isUserKeyUnlocked(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()));