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

Commit 25a17269 authored by Todd Kennedy's avatar Todd Kennedy Committed by android-build-merger
Browse files

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

am: 857bbed0

Change-Id: I81979ec46465c22aca3a6736dd4e1e6a4b5c8c2b
parents 4629f29a 857bbed0

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -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

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -4220,7 +4220,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(