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

Commit 80ae2148 authored by Louis Chang's avatar Louis Chang
Browse files

Remove DisplayContent#positionDisplayAt() 

Use #positionChildAt() instead. Just move code around
and no logic changes.

Bug: 160655575
Test: existing tests
Change-Id: Id1190ee4e69f9d1161c4bdfcc34acc6ef912f072
parent bde58d21

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

+0 −4
Original line number Diff line number Diff line
@@ -2544,10 +2544,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        return mDisplayAreaPolicy.getDefaultTaskDisplayArea();

    }



    void positionDisplayAt(int position, boolean includingParents) {

        getParent().positionChildAt(position, this, includingParents);

    }



    /**

     * Returns true if the input point is within an app window.

     */

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

+3 −3
Original line number Diff line number Diff line
@@ -2931,8 +2931,8 @@ public class WindowManagerService extends IWindowManager.Stub 
        synchronized (mGlobalLock) {

            final DisplayContent displayContent = mRoot.getDisplayContent(displayId);

            if (displayContent != null && mRoot.getTopChild() != displayContent) {

                displayContent.positionDisplayAt(WindowContainer.POSITION_TOP,

                        true /* includingParents */);

                displayContent.getParent().positionChildAt(WindowContainer.POSITION_TOP,

                        displayContent, true /* includingParents */);

            }

        }

        syncInputTransactions();
@@ -8017,7 +8017,7 @@ public class WindowManagerService extends IWindowManager.Stub 


        final DisplayContent displayContent = touchedWindow.getDisplayContent();

        if (!displayContent.isOnTop()) {

            displayContent.positionDisplayAt(WindowContainer.POSITION_TOP,

            displayContent.getParent().positionChildAt(WindowContainer.POSITION_TOP, displayContent,

                    true /* includingParents */);

        }

        handleTaskFocusChange(touchedWindow.getTask());