Merge "[ActivityManager] Fix NPE when start activity"

2014-12-12 13:49:50 +00:00
parent 4c23a0ec16 33bae1f496
commit bfb30244fb
1 changed files with 2 additions and 1 deletions
--- 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,