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

Commit 71378bde authored May 10, 2021 by Jeongsik Mun Committed by Patrick Baumann Jul 19, 2021

Clean up renamed packages during app removal

It doesn't clean up a renamed package when a package is removed
by OTA or uninstalls, which could lead to failing installs for
renamed packages. This CL cleans up renamed packages when an app
is removed and during initialization just in case.

Bug: 178191975
Test: Manulal (removed by OTA)
      Add Package A
      Verify package A exists
      Remove A, add package B w/ original-package A
      Verify package A exists, but codepath is to package B
      Remove B
      Verify the renamed package for B is cleaned up
Test: Manulal (removed by uninstalls)
      Add Package A
      Verify package A exists
      Remove A, add package B w/ original-package A
      Verify package A exists, but codepath is to package B
      Upgrade B on /data and Remove B on /system
      Verify B is installed as non-system app
      Uninstall B
      Verify the renamed package for B is cleaned up
Change-Id: Ief8f7c5b66339f4dea009361fbaca949f1f16367

parent ebef1176

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7577,6 +7577,8 @@ public class PackageManagerService extends IPackageManager.Stub
	}		}
	mExpectingBetter.clear();		mExpectingBetter.clear();

			mSettings.pruneRenamedPackagesLPw();

	// Resolve the storage manager.		// Resolve the storage manager.
	mStorageManagerPackage = getStorageManagerPackageName();		mStorageManagerPackage = getStorageManagerPackageName();

	@@ -21867,6 +21869,8 @@ public class PackageManagerService extends IPackageManager.Stub
	}		}
	clearPackagePreferredActivitiesLPw(		clearPackagePreferredActivitiesLPw(
	deletedPs.name, changedUsers, UserHandle.USER_ALL);		deletedPs.name, changedUsers, UserHandle.USER_ALL);

			mSettings.removeRenamedPackageLPw(deletedPs.realName);
	}		}
	if (changedUsers.size() > 0) {		if (changedUsers.size() > 0) {
	updateDefaultHomeNotLocked(changedUsers);		updateDefaultHomeNotLocked(changedUsers);

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

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -747,6 +747,15 @@ public final class Settings implements Watchable, Snappable {
	mRenamedPackages.remove(pkgName);		mRenamedPackages.remove(pkgName);
	}		}

			void pruneRenamedPackagesLPw() {
			for (int i = mRenamedPackages.size() - 1; i >= 0; i--) {
			PackageSetting ps = mPackages.get(mRenamedPackages.valueAt(i));
			if (ps == null) {
			mRenamedPackages.removeAt(i);
			}
			}
			}

	/** Gets and optionally creates a new shared user id. */		/** Gets and optionally creates a new shared user id. */
	SharedUserSetting getSharedUserLPw(String name, int pkgFlags, int pkgPrivateFlags,		SharedUserSetting getSharedUserLPw(String name, int pkgFlags, int pkgPrivateFlags,
	boolean create) throws PackageManagerException {		boolean create) throws PackageManagerException {