From 2a8931a2f3af41dc3dc81aaeb885e30c837e7a9d Mon Sep 17 00:00:00 2001 From: Tiger Huang Date: Thu, 16 Apr 2020 19:25:11 +0800 Subject: [PATCH] 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 --- services/core/java/com/android/server/wm/WindowState.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 5f2e14f86c94f..6fe10bfd74e71 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -1469,7 +1469,7 @@ class WindowState extends WindowContainer 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;