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

Commit e6821587 authored Oct 08, 2020 by Patrick Baumann Committed by Gerrit Code Review Oct 08, 2020

Merge "Handling removing <original-package> tag"

parents dd27d93a 015cb11e

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -3649,6 +3649,8 @@ public class PackageManagerService extends IPackageManager.Stub
		PackageParser.readConfigUseRoundIcon(mContext.getResources());

		mServiceStartWithDelay = SystemClock.uptimeMillis() + (60 * 1000L);

		Slog.i(TAG, "Fix for b/169414761 is applied");
		}

		/**
		@@ -11096,6 +11098,8 @@ public class PackageManagerService extends IPackageManager.Stub
		mSettings.addRenamedPackageLPw(parsedPackage.getRealPackage(),
		originalPkgSetting.name);
		mTransferredPackages.add(originalPkgSetting.name);
		} else {
		mSettings.removeRenamedPackageLPw(parsedPackage.getPackageName());
		}
		}
		if (pkgSetting.sharedUser != null) {

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -476,6 +476,10 @@ public final class Settings {
		return mRenamedPackages.put(pkgName, origPkgName);
		}

		void removeRenamedPackageLPw(String pkgName) {
		mRenamedPackages.remove(pkgName);
		}

		public boolean canPropagatePermissionToInstantApp(String permName) {
		return mPermissions.canPropagatePermissionToInstantApp(permName);
		}