Merge "Revert "Allow the Instant App installer to be dynamic"" (fbd54b42) · Commits · e / os / android_frameworks_base

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

+9 −20

Original line number	Diff line number	Diff line
		@@ -2879,17 +2879,24 @@ public class PackageManagerService extends IPackageManager.Stub {
		}

		mInstallerService = new PackageInstallerService(context, this);

		final ComponentName ephemeralResolverComponent = getEphemeralResolverLPr();
		if (ephemeralResolverComponent != null) {
		if (DEBUG_EPHEMERAL) {
		Slog.d(TAG, "Set ephemeral resolver: " + ephemeralResolverComponent);
		Slog.i(TAG, "Ephemeral resolver: " + ephemeralResolverComponent);
		}
		mInstantAppResolverConnection =
		new EphemeralResolverConnection(mContext, ephemeralResolverComponent);
		} else {
		mInstantAppResolverConnection = null;
		}
		updateInstantAppInstallerLocked();
		mInstantAppInstallerComponent = getEphemeralInstallerLPr();
		if (mInstantAppInstallerComponent != null) {
		if (DEBUG_EPHEMERAL) {
		Slog.i(TAG, "Ephemeral installer: " + mInstantAppInstallerComponent);
		}
		setUpInstantAppInstallerActivityLP(mInstantAppInstallerComponent);
		}

		// Read and update the usage of dex files.
		// Do this at the end of PM init so that all the packages have their
		@@ -2929,21 +2936,6 @@ public class PackageManagerService extends IPackageManager.Stub {
		Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
		}

		private void updateInstantAppInstallerLocked() {
		final ComponentName oldInstantAppInstallerComponent = mInstantAppInstallerComponent;
		final ComponentName newInstantAppInstallerComponent = getEphemeralInstallerLPr();
		if (newInstantAppInstallerComponent != null
		&& !newInstantAppInstallerComponent.equals(oldInstantAppInstallerComponent)) {
		if (DEBUG_EPHEMERAL) {
		Slog.d(TAG, "Set ephemeral installer: " + newInstantAppInstallerComponent);
		}
		setUpInstantAppInstallerActivityLP(newInstantAppInstallerComponent);
		} else if (DEBUG_EPHEMERAL && newInstantAppInstallerComponent == null) {
		Slog.d(TAG, "Unset ephemeral installer; none available");
		}
		mInstantAppInstallerComponent = newInstantAppInstallerComponent;
		}

		private static File preparePackageParserCache(boolean isUpgrade) {
		if (!DEFAULT_PACKAGE_PARSER_CACHE_ENABLED) {
		return null;
		@@ -16936,7 +16928,6 @@ public class PackageManagerService extends IPackageManager.Stub {

		if (res.returnCode == PackageManager.INSTALL_SUCCEEDED) {
		updateSequenceNumberLP(pkgName, res.newUsers);
		updateInstantAppInstallerLocked();
		}
		}
		}
		@@ -17512,7 +17503,6 @@ public class PackageManagerService extends IPackageManager.Stub {
		mInstantAppRegistry.onPackageUninstalledLPw(pkg, info.removedUsers);
		}
		updateSequenceNumberLP(packageName, info.removedUsers);
		updateInstantAppInstallerLocked();
		}
		}
		}
		@@ -19858,7 +19848,6 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
		}
		scheduleWritePackageRestrictionsLocked(userId);
		updateSequenceNumberLP(packageName, new int[] { userId });
		updateInstantAppInstallerLocked();
		components = mPendingBroadcasts.get(userId, packageName);
		final boolean newPackage = components == null;
		if (newPackage) {