From f91dbf777dded9bee575a7362c496ef9c910f62d Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Wed, 18 Apr 2018 11:42:30 -0700 Subject: [PATCH] Fix NPE when deciding whether to defer task stack animation. Bug: 78084664 Test: Just adding an NPE check Change-Id: I1f07488c5b6e4ad4d1c528e35b7f6b9b00d1fb1b --- services/core/java/com/android/server/wm/TaskStack.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java index ae9e80268741c..2e506ab476df8 100644 --- a/services/core/java/com/android/server/wm/TaskStack.java +++ b/services/core/java/com/android/server/wm/TaskStack.java @@ -1721,6 +1721,9 @@ public class TaskStack extends WindowContainer implements return true; } final Task homeTask = homeStack.getTopChild(); + if (homeTask == null) { + return true; + } final AppWindowToken homeApp = homeTask.getTopVisibleAppToken(); if (!homeTask.isVisible() || homeApp == null) { return true;