Merge "Revert "Create auxiliary info for local instant apps"" into oc-dev (fb195639) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/InstantAppResolveInfo.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ public final class InstantAppResolveInfo implements Parcelable {
		private final int mVersionCode;

		public InstantAppResolveInfo(@NonNull InstantAppDigest digest, @Nullable String packageName,
		@Nullable List<InstantAppIntentFilter> filters, int versionCode) {
		@Nullable List<InstantAppIntentFilter> filters, int versionConde) {
		// validate arguments
		if ((packageName == null && (filters != null && filters.size() != 0))
		\|\| (packageName != null && (filters == null \|\| filters.size() == 0))) {
		@@ -61,7 +61,7 @@ public final class InstantAppResolveInfo implements Parcelable {
		mFilters = null;
		}
		mPackageName = packageName;
		mVersionCode = versionCode;
		mVersionCode = versionConde;
		}

		public InstantAppResolveInfo(@NonNull String hostName, @Nullable String packageName,

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

+13 −26

Original line number	Diff line number	Diff line
		@@ -6499,12 +6499,11 @@ public class PackageManagerService extends IPackageManager.Stub
		String resolvedType, int flags, int userId) {
		// first, check to see if we've got an instant app already installed
		final boolean alreadyResolvedLocally = (flags & PackageManager.MATCH_INSTANT) != 0;
		ResolveInfo localInstantApp = null;
		boolean localInstantAppAvailable = false;
		boolean blockResolution = false;
		if (!alreadyResolvedLocally) {
		final List<ResolveInfo> instantApps = mActivities.queryIntent(intent, resolvedType,
		flags
		\| PackageManager.GET_RESOLVED_FILTER
		\| PackageManager.MATCH_INSTANT
		\| PackageManager.MATCH_VISIBLE_TO_INSTANT_APP_ONLY,
		userId);
		@@ -6531,7 +6530,7 @@ public class PackageManagerService extends IPackageManager.Stub
		if (DEBUG_EPHEMERAL) {
		Slog.v(TAG, "Found installed instant app; pkg: " + packageName);
		}
		localInstantApp = info;
		localInstantAppAvailable = true;
		break;
		}
		}
		@@ -6539,9 +6538,7 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		// no app installed, let's see if one's available
		AuxiliaryResolveInfo auxiliaryResponse = null;
		if (!blockResolution) {
		if (localInstantApp == null) {
		// we don't have an instant app locally, resolve externally
		if (!localInstantAppAvailable && !blockResolution) {
		Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "resolveEphemeral");
		final InstantAppRequest requestObject = new InstantAppRequest(
		null /responseObj/, intent /origIntent/, resolvedType,
		@@ -6550,18 +6547,8 @@ public class PackageManagerService extends IPackageManager.Stub
		InstantAppResolver.doInstantAppResolutionPhaseOne(
		mContext, mInstantAppResolverConnection, requestObject);
		Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
		} else {
		// we have an instant application locally, but, we can't admit that since
		// callers shouldn't be able to determine prior browsing. create a dummy
		// auxiliary response so the downstream code behaves as if there's an
		// instant application available externally. when it comes time to start
		// the instant application, we'll do the right thing.
		final ApplicationInfo ai = localInstantApp.activityInfo.applicationInfo;
		auxiliaryResponse = new AuxiliaryResolveInfo(
		ai.packageName, null /splitName/, ai.versionCode);
		}
		}
		if (auxiliaryResponse != null) {
		if (localInstantAppAvailable \|\| auxiliaryResponse != null) {
		if (DEBUG_EPHEMERAL) {
		Slog.v(TAG, "Adding ephemeral installer to the ResolveInfo list");
		}
		@@ -6581,7 +6568,7 @@ public class PackageManagerService extends IPackageManager.Stub
		ephemeralInstaller.filter = new IntentFilter(intent.getAction());
		ephemeralInstaller.filter.addDataPath(
		intent.getData().getPath(), PatternMatcher.PATTERN_LITERAL);
		ephemeralInstaller.isInstantAppAvailable = true;
		ephemeralInstaller.instantAppAvailable = true;
		result.add(ephemeralInstaller);
		}
		}