summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-02-08 09:10:45 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-02-08 09:10:45 +0000
commitb5300f34c8cc90c7355aa80917fe887f40c38503 (patch)
tree64674108d68dbea50060aae73657921920e1aba1
parent111e41f0c4e32b5561c0ee3e04cf872af67493ba (diff)
parenta89a172a715d4aeaae944b01ca67b5e9e3b3d1da (diff)
Merge "Fixes installed launch intent rewrite"
-rw-r--r--services/core/java/com/android/server/am/ActivityStarter.java2
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 b061ba4106d4..055b89b6a6f0 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;