Handles null outInfo in deleteSystemPackageLI am: 6afabce549 am: ae901aceda (3e28284f) · Commits · e / os / android_frameworks_base

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

+18 −15

Original line number	Diff line number	Diff line
		@@ -19922,7 +19922,8 @@ public class PackageManagerService extends IPackageManager.Stub
		* Tries to delete system package.
		*/
		private boolean deleteSystemPackageLIF(PackageParser.Package deletedPkg,
		PackageSetting deletedPs, int[] allUserHandles, int flags, PackageRemovedInfo outInfo,
		PackageSetting deletedPs, int[] allUserHandles, int flags,
		@Nullable PackageRemovedInfo outInfo,
		boolean writeSettings) {
		if (deletedPs.parentPackageName != null) {
		Slog.w(TAG, "Attempt to delete child system package " + deletedPkg.packageName);
		@@ -19930,7 +19931,7 @@ public class PackageManagerService extends IPackageManager.Stub
		}

		final boolean applyUserRestrictions
		= (allUserHandles != null) && (outInfo.origUsers != null);
		= (allUserHandles != null) && outInfo != null && (outInfo.origUsers != null);
		final PackageSetting disabledPs;
		// Confirm if the system package has been updated
		// An updated system app can be deleted. This will also have to restore
		@@ -19960,6 +19961,7 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		}

		if (outInfo != null) {
		// Delete the updated package
		outInfo.isRemovedPackageSystemUpdate = true;
		if (outInfo.removedChildPackages != null) {
		@@ -19977,6 +19979,7 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		}
		}
		}

		if (disabledPs.versionCode < deletedPs.versionCode) {
		// Delete data for downgrades