Merge "[pm] fix NPE in assertPackageStorageValid" into main (25a6f049) · Commits · e / os / android_frameworks_base

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

+7 −4

Original line number	Diff line number	Diff line
		@@ -503,21 +503,24 @@ public class AppDataHelper {
		private void assertPackageStorageValid(@NonNull Computer snapshot, String volumeUuid,
		String packageName, int userId) throws PackageManagerException {
		final PackageStateInternal packageState = snapshot.getPackageStateInternal(packageName);
		final PackageUserStateInternal userState = packageState.getUserStateOrDefault(userId);
		if (packageState == null) {
		throw PackageManagerException.ofInternalError("Package " + packageName + " is unknown",
		PackageManagerException.INTERNAL_ERROR_STORAGE_INVALID_PACKAGE_UNKNOWN);
		} else if (!TextUtils.equals(volumeUuid, packageState.getVolumeUuid())) {
		}
		if (!TextUtils.equals(volumeUuid, packageState.getVolumeUuid())) {
		throw PackageManagerException.ofInternalError(
		"Package " + packageName + " found on unknown volume " + volumeUuid
		+ "; expected volume " + packageState.getVolumeUuid(),
		PackageManagerException.INTERNAL_ERROR_STORAGE_INVALID_VOLUME_UNKNOWN);
		} else if (!userState.isInstalled() && !userState.dataExists()) {
		}
		final PackageUserStateInternal userState = packageState.getUserStateOrDefault(userId);
		if (!userState.isInstalled() && !userState.dataExists()) {
		throw PackageManagerException.ofInternalError(
		"Package " + packageName + " not installed for user " + userId
		+ " or was deleted without DELETE_KEEP_DATA",
		PackageManagerException.INTERNAL_ERROR_STORAGE_INVALID_NOT_INSTALLED_FOR_USER);
		} else if (packageState.getPkg() != null
		}
		if (packageState.getPkg() != null
		&& !shouldHaveAppStorage(packageState.getPkg())) {
		throw PackageManagerException.ofInternalError(
		"Package " + packageName + " shouldn't have storage",