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

Commit 32bb9993 authored Jul 19, 2021 by TreeHugger Robot Committed by Android (Google) Code Review Jul 19, 2021

Merge "Clean up renamed packages during app removal"

parents dbc85e3d 71378bde

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

+4 −0

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

		mSettings.pruneRenamedPackagesLPw();

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

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

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

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -747,6 +747,15 @@ public final class Settings implements Watchable, Snappable {
		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. */
		SharedUserSetting getSharedUserLPw(String name, int pkgFlags, int pkgPrivateFlags,
		boolean create) throws PackageManagerException {