Merge "Don't require BROWSABLE" into oc-dev

This commit is contained in:
TreeHugger Robot
2017-05-10 14:09:08 +00:00
committed by Android (Google) Code Review
2 changed files with 0 additions and 2 deletions

View File

@@ -637,7 +637,6 @@ class ActivityStarter {
if (componentSpecified
&& intent.getData() != null
&& Intent.ACTION_VIEW.equals(intent.getAction())
&& intent.hasCategory(Intent.CATEGORY_BROWSABLE)
&& mService.getPackageManagerInternalLocked()
.isInstantAppInstallerComponent(intent.getComponent())) {
// intercept intents targeted directly to the ephemeral installer the

View File

@@ -4218,7 +4218,6 @@ public class PackageManagerService extends IPackageManager.Stub
final boolean allowMatchInstant =
(includeInstantApps
&& Intent.ACTION_VIEW.equals(intent.getAction())
&& intent.hasCategory(Intent.CATEGORY_BROWSABLE)
&& hasWebURI(intent))
|| isSpecialProcess
|| mContext.checkCallingOrSelfPermission(