Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57d0c930 authored by keunyoung's avatar keunyoung Committed by Android Git Automerger
Browse files

am 6add5fd4: am 1986ed7a: am 86141f6d: am 3d6b094b: am d76f80bd: Merge "ignore... 

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

* commit '6add5fd4':
  ignore null TaskStack and continue layout for PRIVATE_PRESENTATION window
parents 3f3bddf5 6add5fd4

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

+2 −2
Original line number Diff line number Diff line
@@ -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);

                    }