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

Commit 92af22f0 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 564e8e6f: Merge "Ensure correct window ordering." into klp-dev 

* commit '564e8e6f':
  Ensure correct window ordering.
parents 5b291397 564e8e6f

services/java/com/android/server/wm/DisplayContent.java

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ class DisplayContent { 
    void moveStack(TaskStack stack, boolean toTop) {

        mStackHistory.remove(stack);

        mStackHistory.add(toTop ? mStackHistory.size() : 0, stack);

        mService.moveStackWindowsLocked(stack);

    }



    public boolean isPrivate() {

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

+1 −2
Original line number Diff line number Diff line
@@ -4715,7 +4715,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        }

    }



    private void moveStackWindowsLocked(TaskStack stack) {

    void moveStackWindowsLocked(TaskStack stack) {

        DisplayContent displayContent = stack.getDisplayContent();



        // First remove all of the windows from the list.
@@ -4782,7 +4782,6 @@ public class WindowManagerService extends IWindowManager.Stub 
                }

                stack.moveTaskToTop(task);

                displayContent.moveStack(stack, true);

                moveStackWindowsLocked(stack);

            }

        } finally {

            Binder.restoreCallingIdentity(origId);