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

Commit 5ee6d19f authored by Craig Mautner's avatar Craig Mautner
Browse files

Ensure correct window ordering. 

Make sure that moveStackWindowsLocked() is called every time that the
stack ordering changes. This will rebuild the window list. Previously
the call was being made after the moveStack() call which got forgotten
in the addAppToken() causing the home stack to obscure incoming phone
and video calls.

Fixes bug 10023223.
Fixes bug 10678010.
Maybe fixes bug 10858941.

Change-Id: I59922dc979a19210008eac1f528704984c63c886
parent adf14902

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