summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author keunyoung <keunyoung@google.com> 2014-10-07 14:26:16 -0700
committer keunyoung <keunyoung@google.com> 2014-10-07 14:46:24 -0700
commit030a93feb896d228317eb8dba6a89743c4d26dd7 (patch)
treed9cd5b229b2df7db0885ab24ed30ded06d265208
parent3bde32e68d201f2dda4a4847d2818c74b120cdbb (diff)
ignore null TaskStack and continue layout for PRIVATE_PRESENTATION window
bug: 17677973 Change-Id: I2666a1c1cf8956e60d7261912da34d1999131eba
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 467b9a48cefa..8437d5268b2d 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 @@ public class WindowManagerService extends IWindowManager.Stub
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 @@ public class WindowManagerService extends IWindowManager.Stub
handleNotObscuredLocked(w, currentTime, innerDw, innerDh);
}
- if (!stack.testDimmingTag()) {
+ if (stack != null && !stack.testDimmingTag()) {
handleFlagDimBehind(w);
}