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

Commit 0615cb38 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix stuck IME when IME dialog is focused" into rvc-dev am: a13d3491... 

Merge "Fix stuck IME when IME dialog is focused" into rvc-dev am: a13d3491 am: bf2c10fe am: 41226238

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12174528

Change-Id: I4eb06d91fa7413db5260823b73ad6c843d3f22ab
parents 8af44b27 41226238

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

+3 −0
Original line number Diff line number Diff line
@@ -2170,6 +2170,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        if (isInputMethodTarget()) {

            dc.computeImeTarget(true /* updateImeTarget */);

        }

        if (dc.mInputMethodInputTarget == this) {

            dc.setInputMethodInputTarget(null);

        }

        if (dc.mInputMethodControlTarget == this) {

            dc.updateImeControlTarget();

        }

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

+15 −0
Original line number Diff line number Diff line
@@ -886,6 +886,21 @@ public class DisplayContentTests extends WindowTestsBase { 
        assertEquals(dc.getImeContainer().getParentSurfaceControl(), dc.computeImeParent());

    }



    @Test

    public void testInputMethodInputTarget_isClearedWhenWindowStateIsRemoved() throws Exception {

        final DisplayContent dc = createNewDisplay();



        WindowState app = createWindow(null, TYPE_BASE_APPLICATION, dc, "app");



        dc.mInputMethodInputTarget = app;

        assertEquals(app, dc.computeImeControlTarget());



        app.removeImmediately();



        assertNull(dc.mInputMethodInputTarget);

        assertNull(dc.computeImeControlTarget());

    }



    @Test

    public void testComputeImeControlTarget() throws Exception {

        final DisplayContent dc = createNewDisplay();