Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't require BROWSABLE" into oc-dev am: 59b9a851a7

Browse Source 
am: 857bbed067

Change-Id: I81979ec46465c22aca3a6736dd4e1e6a4b5c8c2b
This commit is contained in:
Todd Kennedy
2017-05-10 15:00:38 +00:00
committed by android-build-merger
parent 4629f29acb 857bbed067
commit 25a17269b5
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/am/ActivityStarter.java
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

1
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -4220,7 +4220,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(