Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '86141f6d4039e2ea40fc2827c28fc7ce7fded990':
  ignore null TaskStack and continue layout for PRIVATE_PRESENTATION window
This commit is contained in:
keunyoung
2014-10-08 05:35:20 +00:00
committed by Android Git Automerger
parent 4b8e785944 86141f6d40
commit 1986ed7a9b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -9598,7 +9598,7 @@ public class WindowManagerService extends IWindowManager.Stub
for (i=N-1; i>=0; i--) { for (i=N-1; i>=0; i--) {
WindowState w = windows.get(i); WindowState w = windows.get(i);
final TaskStack stack = w.getStack(); final TaskStack stack = w.getStack();
if (stack == null) { if (stack == null && w.getAttrs().type != TYPE_PRIVATE_PRESENTATION) {
continue; continue;
} }
@@ -9610,7 +9610,7 @@ public class WindowManagerService extends IWindowManager.Stub
handleNotObscuredLocked(w, currentTime, innerDw, innerDh); handleNotObscuredLocked(w, currentTime, innerDw, innerDh);
} }
if (!stack.testDimmingTag()) { if (stack != null && !stack.testDimmingTag()) {
handleFlagDimBehind(w); handleFlagDimBehind(w);
} }