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

* commit 'd76f80bd3a38e11d27935cbe461c3a9d4243dd76':
  ignore null TaskStack and continue layout for PRIVATE_PRESENTATION window
This commit is contained in:
keunyoung
2014-10-08 05:11:42 +00:00
committed by Android Git Automerger

View File

@@ -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);
}