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

Browse Source 
Change-Id: Iea20de480923a553dd00db601b22d5de2c8dcd6e
This commit is contained in:
Tiger Huang
2020-04-16 16:07:25 +00:00
committed by Automerger Merge Worker
parent 3bfe58bd5e 764c0be373
commit ad1626b192
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;