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

Commit 2a8931a2 authored by Tiger Huang's avatar Tiger Huang
Browse files

Only clear mInputMethodInputTarget if it is moved to the new display 

onDisplayChanged can also be invoked when the configuration is
changed on the display. In this case, we should not clear
mInputMethodInputTarget.

Bug: 154108034
Test: atest MultiDisplayClientTests
Change-Id: Ic6d9bcb12fde5f7718f9475f228bab33aac49d25
parent ee35eba0

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

+1 −1
Original line number Diff line number Diff line
@@ -1469,7 +1469,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 


    @Override

    void onDisplayChanged(DisplayContent dc) {

        if (dc != null && mDisplayContent != null

        if (dc != null && mDisplayContent != null && dc != mDisplayContent

                && mDisplayContent.mInputMethodInputTarget == this) {

            dc.setInputMethodInputTarget(mDisplayContent.mInputMethodInputTarget);

            mDisplayContent.mInputMethodInputTarget = null;