Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev (3b1f8607) · Commits · e / os / android_frameworks_base

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

+6 −8

Original line number	Diff line number	Diff line
		@@ -801,12 +801,9 @@ public class PackageManagerService extends IPackageManager.Stub {
		}

		private static boolean hasValidDomains(ActivityIntentInfo filter) {
		boolean hasHTTPorHTTPS = filter.hasDataScheme(IntentFilter.SCHEME_HTTP) \|\|
		filter.hasDataScheme(IntentFilter.SCHEME_HTTPS);
		if (!hasHTTPorHTTPS) {
		return false;
		}
		return true;
		return filter.hasCategory(Intent.CATEGORY_BROWSABLE)
		&& (filter.hasDataScheme(IntentFilter.SCHEME_HTTP) \|\|
		filter.hasDataScheme(IntentFilter.SCHEME_HTTPS));
		}

		private IntentFilterVerifier mIntentFilterVerifier;
		@@ -15075,8 +15072,9 @@ public class PackageManagerService extends IPackageManager.Stub {
		}
		if (filters != null && filters.size() > 0) {
		for (IntentFilter filter : filters) {
		if (filter.hasDataScheme(IntentFilter.SCHEME_HTTP) \|\|
		filter.hasDataScheme(IntentFilter.SCHEME_HTTPS)) {
		if (filter.hasCategory(Intent.CATEGORY_BROWSABLE)
		&& (filter.hasDataScheme(IntentFilter.SCHEME_HTTP) \|\|
		filter.hasDataScheme(IntentFilter.SCHEME_HTTPS))) {
		result.addAll(filter.getHostsList());
		}
		}