From cdc0ddca916e98a74435218a4d2310d6a1931e68 Mon Sep 17 00:00:00 2001 From: Wale Ogunwale Date: Thu, 17 Nov 2016 10:34:58 -0800 Subject: [PATCH] Fixed NPE in ActivityStarter.updateTaskReturnToType() Bug: 30834977 Test: Manual testing of condition in bug. Change-Id: I4b46a380fa0b52d983965dfb056b461c53afcd05 --- services/core/java/com/android/server/am/ActivityStarter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index ccd94cb475a39..dff7cefae456e 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -1524,8 +1524,8 @@ class ActivityStarter { private void updateTaskReturnToType( TaskRecord task, int launchFlags, ActivityStack focusedStack) { - if (focusedStack != null && focusedStack.isHomeStack() && - focusedStack.topTask().isOnTopLauncher()) { + if (focusedStack != null && focusedStack.isHomeStack() && focusedStack.topTask() != null + && focusedStack.topTask().isOnTopLauncher()) { // Since an on-top launcher will is moved to back when tasks are launched from it, // those tasks should first try to return to a non-home activity. // This also makes sure that non-home activities are visible under a transparent