From ddb96df9217d870a9d8efda98f0af666eda2b484 Mon Sep 17 00:00:00 2001 From: Filip Gruszczynski Date: Sun, 17 Jan 2016 09:12:31 -0800 Subject: [PATCH] Fix NPE when checking if recents should be launched in docked mode. In some cases the activity starting method might return early with positive return code, even though it skipped doing most of the work and the target stack is not set. We need to protect ourselves from an NPE in that case. Bug: 26541093 Change-Id: I7227ad8efa30c52dd8178ad3c9d8b2263c89a74f --- services/core/java/com/android/server/am/ActivityStarter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index 58c14f17c1c3d..ab0263cec4590 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -1034,7 +1034,8 @@ class ActivityStarter { } private void launchRecentsAppIfNeeded(ActivityStack topStack) { - if (topStack.mStackId == HOME_STACK_ID && mTargetStack.mStackId == DOCKED_STACK_ID) { + if (topStack.mStackId == HOME_STACK_ID && mTargetStack != null + && mTargetStack.mStackId == DOCKED_STACK_ID) { // We launch an activity while being in home stack, which means either launcher or // recents into docked stack. We don't want the launched activity to be alone in a // docked stack, so we want to immediately launch recents too.