commit 86141f6d4039e2ea40fc2827c28fc7ce7fded990
author keunyoung <keunyoung@google.com> Wed Oct 08 05:24:06 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 08 05:24:06 2014 +0000
tree 9d0a22423f92268e544c8a3b27f5262983072070
parent 439343246e551749b61e161134f832aef492c383
parent 3d6b094b88c129717d44e422c2b93012b3764baa

am 3d6b094b: am d76f80bd: Merge "ignore null TaskStack and continue layout for PRIVATE_PRESENTATION window" into lmp-dev

* commit '3d6b094b88c129717d44e422c2b93012b3764baa':
  ignore null TaskStack and continue layout for PRIVATE_PRESENTATION window

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

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 467b9a4..8437d52 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -9598,7 +9598,7 @@
                 for (i=N-1; i>=0; i--) {
                     WindowState w = windows.get(i);
                     final TaskStack stack = w.getStack();
-                    if (stack == null) {
+                    if (stack == null && w.getAttrs().type != TYPE_PRIVATE_PRESENTATION) {
                         continue;
                     }
 
@@ -9610,7 +9610,7 @@
                         handleNotObscuredLocked(w, currentTime, innerDw, innerDh);
                     }
 
-                    if (!stack.testDimmingTag()) {
+                    if (stack != null && !stack.testDimmingTag()) {
                         handleFlagDimBehind(w);
                     }