commit 8b18f2d6c604ab80746e18bea930a22435e4c487
author Filip Gruszczynski <gruszczy@google.com> Mon Dec 21 17:12:15 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 21 17:12:15 2015 +0000
tree 08451a6100fc36670d1179db2ad5bab7ff76ba60
parent d2be14a16aee0bd44c6ba07c487833f86bb19aaf
parent 7818803ecbe7d041c6c44da97c3fd54132404201

Merge "Prevent NPE in layer assignment, not all windows have a stack."

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

diff --git a/services/core/java/com/android/server/wm/WindowLayersController.java b/services/core/java/com/android/server/wm/WindowLayersController.java
index 4a77b22..9af3eb3 100644
--- a/services/core/java/com/android/server/wm/WindowLayersController.java
+++ b/services/core/java/com/android/server/wm/WindowLayersController.java
@@ -159,6 +159,9 @@
             mDockDivider = w;
         } else {
             final TaskStack stack = w.getStack();
+            if (stack == null) {
+                return;
+            }
             if (stack.mStackId == StackId.PINNED_STACK_ID) {
                 mPinnedWindow = w;
             } else if (stack.mStackId == StackId.DOCKED_STACK_ID) {