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

Commit 32859b1d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix a potential NPE after scheduleShowImePostLayout"

parents 42addf53 7b5ae865

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

+6 −0
Original line number Diff line number Diff line
@@ -218,6 +218,12 @@ final class ImeInsetsSourceProvider extends WindowContainerInsetsSourceProvider 
        if (dcTarget == null || mImeRequester == null) {

            return false;

        }

        // Not ready to show if there is no IME control target.

        final InsetsControlTarget controlTarget = mDisplayContent.getImeTarget(IME_TARGET_CONTROL);

        if (controlTarget == null) {

            return false;

        }



        ProtoLog.d(WM_DEBUG_IME, "dcTarget: %s mImeRequester: %s",

                dcTarget.getWindow().getName(), mImeRequester.getWindow() == null

                        ? mImeRequester : mImeRequester.getWindow().getName());

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

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ public class ImeInsetsSourceProviderTest extends WindowTestsBase { 
    public void testInputMethodInputTargetCanShowIme() {

        WindowState target = createWindow(null, TYPE_APPLICATION, "app");

        mDisplayContent.setImeLayeringTarget(target);

        mDisplayContent.updateImeInputAndControlTarget(target);

        mImeProvider.scheduleShowImePostLayout(target);

        assertTrue(mImeProvider.isReadyToShowIme());

    }