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

Browse Source 
am: 59b9a851a7

Change-Id: I4bcbcddd76b9fa4e85a0edf223a98b8c18dd791c
This commit is contained in:
Todd Kennedy
2017-05-10 14:33:19 +00:00
committed by android-build-merger
parent b6eedcc811 59b9a851a7
commit 857bbed067
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 if (componentSpecified
&& intent.getData() != null && intent.getData() != null
&& Intent.ACTION_VIEW.equals(intent.getAction()) && Intent.ACTION_VIEW.equals(intent.getAction())
&& intent.hasCategory(Intent.CATEGORY_BROWSABLE)
&& mService.getPackageManagerInternalLocked() && mService.getPackageManagerInternalLocked()
.isInstantAppInstallerComponent(intent.getComponent())) { .isInstantAppInstallerComponent(intent.getComponent())) {
// intercept intents targeted directly to the ephemeral installer the // intercept intents targeted directly to the ephemeral installer the

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

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