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

Merge "Attempt to fix updateImeParent transaction synchronized issue" into sc-v2-dev am: a70a32a917

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16512320

Change-Id: I3a727c9e2a65e90bbdd2c317a8a7f403cc6feec0
This commit is contained in:
TreeHugger Robot
2022-01-10 11:05:05 +00:00
committed by Automerger Merge Worker
parent 31abbf9b5d a70a32a917
commit 0a600d9de6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -4165,10 +4165,10 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
final SurfaceControl newParent = computeImeParent(); final SurfaceControl newParent = computeImeParent();
if (newParent != null && newParent != mInputMethodSurfaceParent) { if (newParent != null && newParent != mInputMethodSurfaceParent) {
mInputMethodSurfaceParent = newParent; mInputMethodSurfaceParent = newParent;
getPendingTransaction().reparent(mImeWindowsContainer.mSurfaceControl, newParent); getSyncTransaction().reparent(mImeWindowsContainer.mSurfaceControl, newParent);
// When surface parent is removed, the relative layer will also be removed. We need to // When surface parent is removed, the relative layer will also be removed. We need to
// do a force update to make sure there is a layer set for the new parent. // do a force update to make sure there is a layer set for the new parent.
assignRelativeLayerForIme(getPendingTransaction(), true /* forceUpdate */); assignRelativeLayerForIme(getSyncTransaction(), true /* forceUpdate */);
scheduleAnimation(); scheduleAnimation();
} }
} }