Fixes installed launch intent rewrite

Logic that detected how to handle already installed apps was resulting
in the instant app launching with the ephemral installer intent
targeted directly at the already resolved component.

This change reverts that logic to the original logic.
Offending change: ag/3540305

Change-Id: I4dec9bfd1282203229d03695e3a1b6ed5913696a
Fixes: 73018868
Test: manual - installed instant apps now launch as expected
Test: manual - generic intent test app still works as expected

1 files changed, 1 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java
index eab88aa45e44..26ebb545c61c 100644
--- a/services/core/java/com/android/server/am/ActivityStarter.java
+++ b/services/core/java/com/android/server/am/ActivityStarter.java
@@ -790,7 +790,7 @@ class ActivityStarter {
         // Instead, launch the ephemeral installer. Once the installer is finished, it
         // starts either the intent we resolved here [on install error] or the ephemeral
         // app [on install success].
-        if (rInfo != null && rInfo.isInstantAppAvailable) {
+        if (rInfo != null && rInfo.auxiliaryInfo != null) {
             intent = createLaunchIntent(rInfo.auxiliaryInfo, ephemeralIntent,
                     callingPackage, verificationBundle, resolvedType, userId);
             resolvedType = null;