diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 03dd3c0c7e49a..6f5866a620679 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -1315,7 +1315,6 @@ public final class ActivityStackSupervisor implements DisplayListener { } } } - ActivityStack resultStack = resultRecord == null ? null : resultRecord.task.stack; final int launchFlags = intent.getFlags(); @@ -1392,6 +1391,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,