diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index d9396d857d6c5..262b4f1f38399 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -1314,7 +1314,6 @@ public final class ActivityStackSupervisor implements DisplayListener { } } } - ActivityStack resultStack = resultRecord == null ? null : resultRecord.task.stack; final int launchFlags = intent.getFlags(); @@ -1391,6 +1390,8 @@ public final class ActivityStackSupervisor implements DisplayListener { } } + final ActivityStack resultStack = resultRecord == null ? null : resultRecord.task.stack; + if (err != ActivityManager.START_SUCCESS) { if (resultRecord != null) { resultStack.sendActivityResultLocked(-1,