commit 1289a3b2d3ae6ba67215d984c3302bfdcd69ae14
author Craig Mautner <cmautner@google.com> Thu Dec 04 21:44:33 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 04 21:44:39 2014 +0000
tree fac957ebb75f74e8d8ac760c2d6d75eb2870229f
parent 9c28ba76f6865b3531b38e1d7f9be258571e9c2d
parent cd5d198d7e852bc68871a279afbaa1b94e86a023

Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev

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 d9396d8..262b4f1 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 @@
                 }
             }
         }
-        ActivityStack resultStack = resultRecord == null ? null : resultRecord.task.stack;
 
         final int launchFlags = intent.getFlags();
 
@@ -1391,6 +1390,8 @@
             }
         }
 
+        final ActivityStack resultStack = resultRecord == null ? null : resultRecord.task.stack;
+
         if (err != ActivityManager.START_SUCCESS) {
             if (resultRecord != null) {
                 resultStack.sendActivityResultLocked(-1,