commit 14810c7e3e5c8153183e36a819779cff4a979c89
author Jorim Jaggi <jjaggi@google.com> Mon Mar 28 12:35:31 2016 -0700
committer Jorim Jaggi <jjaggi@google.com> Mon Mar 28 19:55:32 2016 +0000
tree 747489b0e68ca72dd9a8147b987afc1c56a57e8d
parent 9971d02c38151a4289552d5b1cfb7b3c7c0acec6

Fix null pointer exception

- Make sure to use the correct task to get the stack.
- Don't try to show non-resizable toast when we didn't do
anything.

Bug: 27870378
Change-Id: I69fec6aa792c2f05d905a7c99c05ebdc689ad032

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

diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java
index e3ca3ea..3bbc452 100644
--- a/services/core/java/com/android/server/am/ActivityStarter.java
+++ b/services/core/java/com/android/server/am/ActivityStarter.java
@@ -947,8 +947,6 @@
                 // We didn't do anything...  but it was needed (a.k.a., client don't use that
                 // intent!)  And for paranoia, make sure we have correctly resumed the top activity.
                 resumeTargetStackIfNeeded();
-                mSupervisor.showNonResizeableDockToastIfNeeded(mStartActivity.task,
-                        preferredLaunchStackId, mTargetStack.mStackId);
                 return START_TASK_TO_FRONT;
             }
         }
@@ -989,7 +987,7 @@
             top.deliverNewIntentLocked(
                     mCallingUid, mStartActivity.intent, mStartActivity.launchedFromPackage);
             mSupervisor.showNonResizeableDockToastIfNeeded(mStartActivity.task,
-                    preferredLaunchStackId, mTargetStack.mStackId);
+                    preferredLaunchStackId, topStack.mStackId);
             return START_DELIVERED_TO_TOP;
         }