From 79744b4cbbc1d96c034bd04b82beac918f27a801 Mon Sep 17 00:00:00 2001 From: Patrick Baumann Date: Thu, 11 May 2023 15:55:01 +0000 Subject: [PATCH] Bypass instant app resolution when NON_BROWSER specified This change bypasses instant app navigation when the caller provides the non-browser flag on an intent. Instant resolution is a stand-in for the browser and when an instant app fails to install or similar, the fallback to browser would fail with this flag present. Fixes: 269673899 Test: manual Test: atest EphemeralTest Change-Id: I01e3017367fe74d923a1bc72970a4bcde362fc27 --- services/core/java/com/android/server/pm/ComputerEngine.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java index 1aa1fd10b00e5..a3866caacf39e 100644 --- a/services/core/java/com/android/server/pm/ComputerEngine.java +++ b/services/core/java/com/android/server/pm/ComputerEngine.java @@ -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; }