commit d5cc0bc170a88ab1dc5ed74a93561a253df567bc
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Dec 11 14:38:23 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 11 14:38:23 2018 +0000
tree 3fa3ffeabf2291fac5cba06086db17fb0827336c
parent ccd3bb6bbddb4744e33dff035d2aa4dcb5d1f138
parent 24f7a03daf5a18c7f6e06817afe70a07e5f3d29f

Merge "Prevents NPE after stack got removed from display"

services/core/java/com/android/server/wm/ActivityStack.java

diff --git a/services/core/java/com/android/server/wm/ActivityStack.java b/services/core/java/com/android/server/wm/ActivityStack.java
index 7683172..aca9702 100644
--- a/services/core/java/com/android/server/wm/ActivityStack.java
+++ b/services/core/java/com/android/server/wm/ActivityStack.java
@@ -1797,7 +1797,7 @@
         // focus). Also if there is an active pinned stack - we always want to notify it about
         // task stack changes, because its positioning may depend on it.
         if (mStackSupervisor.mAppVisibilitiesChangedSinceLastPause
-                || getDisplay().hasPinnedStack()) {
+                || (getDisplay() != null && getDisplay().hasPinnedStack())) {
             mService.getTaskChangeNotificationController().notifyTaskStackChanged();
             mStackSupervisor.mAppVisibilitiesChangedSinceLastPause = false;
         }