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

Commit 6b27ac99 authored by Patrick Baumann's avatar Patrick Baumann Committed by Automerger Merge Worker
Browse files

Merge "Bypass instant app resolution when NON_BROWSER specified" into udc-dev... 

Merge "Bypass instant app resolution when NON_BROWSER specified" into udc-dev am: af6326c8 am: 813bee9c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23173229



Change-Id: Ia1edfcdd9efe0abe993cc73cad1f22ca88e75471
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9384317c 813bee9c

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

+3 −0
Original line number Diff line number Diff line
@@ -2310,6 +2310,9 @@ public class ComputerEngine implements Computer { 
        if ((intent.getFlags() & Intent.FLAG_IGNORE_EPHEMERAL) != 0) {

            return false;

        }

        if ((intent.getFlags() & Intent.FLAG_ACTIVITY_REQUIRE_NON_BROWSER) != 0) {

            return false;

        }

        if (!skipPackageCheck && intent.getPackage() != null) {

            return false;

        }