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

Commit f6abd922 authored by Tiger Huang's avatar Tiger Huang Committed by Automerger Merge Worker
Browse files

Merge "Only clear mInputMethodInputTarget if it is moved to the new display"... 

Merge "Only clear mInputMethodInputTarget if it is moved to the new display" into rvc-dev am: 764c0be3 am: ad1626b1 am: 067a3e2f

Change-Id: I4a8a0bdf3f4db0898aa0c9d00b91064dd3a095b3
parents 532c8866 067a3e2f

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

+1 −1
Original line number Diff line number Diff line
@@ -1457,7 +1457,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;