From 14810c7e3e5c8153183e36a819779cff4a979c89 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Mon, 28 Mar 2016 12:35:31 -0700 Subject: [PATCH] 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 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index e3ca3ea904439..3bbc4521fda07 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 @@ class ActivityStarter { // 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 @@ class ActivityStarter { top.deliverNewIntentLocked( mCallingUid, mStartActivity.intent, mStartActivity.launchedFromPackage); mSupervisor.showNonResizeableDockToastIfNeeded(mStartActivity.task, - preferredLaunchStackId, mTargetStack.mStackId); + preferredLaunchStackId, topStack.mStackId); return START_DELIVERED_TO_TOP; }