Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only clear mInputMethodInputTarget if it is moved to the new display" into rvc-dev am: 764c0be373 am: ad1626b192

Browse Source 
Change-Id: Ie93d4f9ea7b5355166004608012d6a9e1664af18
This commit is contained in:
Tiger Huang
2020-04-16 16:27:04 +00:00
committed by Automerger Merge Worker
parent 923c273aac ad1626b192
commit 958f53474b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -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;