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

Commit 62e18bd5 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Early out when window is no longer in hierarchy" into rvc-dev... 

Merge "Merge "Early out when window is no longer in hierarchy" into rvc-dev am: f9e220f0 am: fcf684d3" into rvc-d1-dev-plus-aosp am: 76874c50 am: e0284aa8

Change-Id: I971c3c0c4557177e627e54964cfc56972a7831f0
parents 7d5ad215 e0284aa8

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

+3 −1
Original line number Diff line number Diff line
@@ -5333,7 +5333,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
            // this promotion.

            final WindowState imeTarget = getDisplayContent().mInputMethodTarget;

            boolean inTokenWithAndAboveImeTarget = imeTarget != null && imeTarget != this

                    && imeTarget.mToken == mToken && imeTarget.compareTo(this) <= 0;

                    && imeTarget.mToken == mToken

                    && getParent() != null

                    && imeTarget.compareTo(this) <= 0;

            return inTokenWithAndAboveImeTarget;

        }

        return false;

services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java

+12 −0
Original line number Diff line number Diff line
@@ -657,4 +657,16 @@ public class WindowStateTests extends WindowTestsBase { 
        win0.mActivityRecord.getStack().setFocusable(false);

        assertTrue(win0.cantReceiveTouchInput());

    }



    @Test

    public void testNeedsRelativeLayeringToIme_notAttached() {

        WindowState sameTokenWindow = createWindow(null, TYPE_BASE_APPLICATION, mAppWindow.mToken,

                "SameTokenWindow");

        mDisplayContent.mInputMethodTarget = mAppWindow;

        sameTokenWindow.mActivityRecord.getStack().setWindowingMode(

                WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);

        assertTrue(sameTokenWindow.needsRelativeLayeringToIme());

        sameTokenWindow.removeImmediately();

        assertFalse(sameTokenWindow.needsRelativeLayeringToIme());

    }

}