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

Commit 633e0e31 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 am: f6abd922

Change-Id: I043f93cd487a1a5f24821f358fba097ef7842831
parents 49053eb0 f6abd922

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

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