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

Commit 4b1f8e2f authored Feb 06, 2018 by TreeHugger Robot Committed by Android (Google) Code Review Feb 06, 2018

Merge "Require only ACTION_VIEW for web instant apps"

parents 5df6f4c5 0da8537c

core/java/android/app/InstantAppResolverService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ public abstract class InstantAppResolverService extends Service {
		public void onGetInstantAppResolveInfo(Intent sanitizedIntent, int[] hostDigestPrefix,
		String token, InstantAppResolutionCallback callback) {
		// if not overridden, forward to old methods and filter out non-web intents
		if (sanitizedIntent.isBrowsableWebIntent()) {
		if (sanitizedIntent.isWebIntent()) {
		onGetInstantAppResolveInfo(hostDigestPrefix, token, callback);
		} else {
		callback.onInstantAppResolveInfo(Collections.emptyList());
		@@ -107,7 +107,7 @@ public abstract class InstantAppResolverService extends Service {
		String token, InstantAppResolutionCallback callback) {
		Log.e(TAG, "New onGetInstantAppIntentFilter is not overridden");
		// if not overridden, forward to old methods and filter out non-web intents
		if (sanitizedIntent.isBrowsableWebIntent()) {
		if (sanitizedIntent.isWebIntent()) {
		onGetInstantAppIntentFilter(hostDigestPrefix, token, callback);
		} else {
		callback.onInstantAppResolveInfo(Collections.emptyList());

core/java/android/content/Intent.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -10089,9 +10089,8 @@ public class Intent implements Parcelable, Cloneable {
		}

		/** @hide */
		public boolean isBrowsableWebIntent() {
		public boolean isWebIntent() {
		return ACTION_VIEW.equals(mAction)
		&& hasCategory(CATEGORY_BROWSABLE)
		&& hasWebURI();
		}

core/java/com/android/internal/app/ResolverListController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ public class ResolverListController {
		int flags = PackageManager.MATCH_DEFAULT_ONLY
		\| (shouldGetResolvedFilter ? PackageManager.GET_RESOLVED_FILTER : 0)
		\| (shouldGetActivityMetadata ? PackageManager.GET_META_DATA : 0);
		if (intent.isBrowsableWebIntent()
		if (intent.isWebIntent()
		\|\| (intent.getFlags() & Intent.FLAG_ACTIVITY_MATCH_EXTERNAL) != 0) {
		flags \|= PackageManager.MATCH_INSTANT;
		}

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1266,7 +1266,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
		Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "resolveIntent");
		int modifiedFlags = flags
		\| PackageManager.MATCH_DEFAULT_ONLY \| ActivityManagerService.STOCK_PM_FLAGS;
		if (intent.isBrowsableWebIntent()
		if (intent.isWebIntent()
		\|\| (intent.getFlags() & Intent.FLAG_ACTIVITY_MATCH_EXTERNAL) != 0) {
		modifiedFlags \|= PackageManager.MATCH_INSTANT;
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -377,7 +377,7 @@ public abstract class InstantAppResolver {
		failureIntent.setFlags(failureIntent.getFlags() \| Intent.FLAG_IGNORE_EPHEMERAL);
		failureIntent.setLaunchToken(token);
		ArrayList<AuxiliaryResolveInfo.AuxiliaryFilter> filters = null;
		boolean isWebIntent = origIntent.isBrowsableWebIntent();
		boolean isWebIntent = origIntent.isWebIntent();
		for (InstantAppResolveInfo instantAppResolveInfo : instantAppResolveInfoList) {
		if (shaPrefix.length > 0 && instantAppResolveInfo.shouldLetInstallerDecide()) {
		Slog.e(TAG, "InstantAppResolveInfo with mShouldLetInstallerDecide=true when digest"
		@@ -448,7 +448,7 @@ public abstract class InstantAppResolver {
		instantAppInfo.getIntentFilters();
		if (instantAppFilters == null \|\| instantAppFilters.isEmpty()) {
		// No filters on web intent; no matches, 2nd phase unnecessary.
		if (origIntent.isBrowsableWebIntent()) {
		if (origIntent.isWebIntent()) {
		return null;
		}
		// No filters; we need to start phase two