commit 012de64e2dade079979bfa6cdca323b36901a0e6
author Christopher Tate <ctate@android.com> Fri Dec 12 22:11:15 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 12 22:11:16 2014 +0000
tree 828823ae07c28e70b629822a6603a09f6f311b4a
parent bfb30244fbd3c6ba9eb8308b6bbacc9f78e8b6ef
parent 649acab38956759213309835de39b14d43c1417e

Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms"

services/core/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 03dd3c0..6f5866a 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 @@
                 }
             }
         }
-        ActivityStack resultStack = resultRecord == null ? null : resultRecord.task.stack;
 
         final int launchFlags = intent.getFlags();
 
@@ -1392,6 +1391,8 @@
             }
         }
 
+        final ActivityStack resultStack = resultRecord == null ? null : resultRecord.task.stack;
+
         if (err != ActivityManager.START_SUCCESS) {
             if (resultRecord != null) {
                 resultStack.sendActivityResultLocked(-1,