Merge "Merge "Merge "Enable upgrading persistent APKs on boot." into qt-dev... (5e3c8590) · Commits · e / os / android_frameworks_base

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -939,6 +939,7 @@ public class PackageManagerService extends IPackageManager.Stub
		ComponentName mCustomResolverComponentName;

		boolean mResolverReplaced = false;
		boolean mOkToReplacePersistentPackages = false;

		private final @Nullable ComponentName mIntentFilterVerifierComponent;
		private final @Nullable IntentFilterVerifier<ActivityIntentInfo> mIntentFilterVerifier;
		@@ -17330,7 +17331,8 @@ public class PackageManagerService extends IPackageManager.Stub
		+ " target SDK " + oldTargetSdk + " does.");
		}
		// Prevent persistent apps from being updated
		if ((oldPackage.applicationInfo.flags & ApplicationInfo.FLAG_PERSISTENT) != 0) {
		if (((oldPackage.applicationInfo.flags & ApplicationInfo.FLAG_PERSISTENT) != 0)
		&& !mOkToReplacePersistentPackages) {
		throw new PrepareFailure(PackageManager.INSTALL_FAILED_INVALID_APK,
		"Package " + oldPackage.packageName + " is a persistent app. "
		+ "Persistent apps are not updateable.");
		@@ -21510,10 +21512,12 @@ public class PackageManagerService extends IPackageManager.Stub

		mModuleInfoProvider.systemReady();

		mOkToReplacePersistentPackages = true;
		// Installer service might attempt to install some packages that have been staged for
		// installation on reboot. Make sure this is the last component to be call since the
		// installation might require other components to be ready.
		mInstallerService.restoreAndApplyStagedSessionIfNeeded();
		mOkToReplacePersistentPackages = false;
		}

		public void waitForAppDataPrepared() {