Merge "Attempt to fix updateImeParent transaction synchronized issue" into sc-v2-dev am: a70a32a917 am: 0a600d9de6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16512320 Change-Id: I9aa596511ddddd62be3ad5477cdb59d59e91f4b4
This commit is contained in:
@@ -4198,10 +4198,10 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
|
||||
final SurfaceControl newParent = computeImeParent();
|
||||
if (newParent != null && newParent != mInputMethodSurfaceParent) {
|
||||
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
|
||||
// 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();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user