Merge "Fix PiP window on rotation" into rvc-dev

This commit is contained in:
Hongwei Wang
2020-04-22 23:26:19 +00:00
committed by Android (Google) Code Review

View File

@@ -884,8 +884,8 @@ class WindowStateAnimator {
clipRect = mTmpClipRect;
}
if (mSurfaceResized && (mAttrType == TYPE_BASE_APPLICATION) &&
(task != null) && (task.getMainWindowSizeChangeTransaction() != null)) {
if (w.mInRelayout && (mAttrType == TYPE_BASE_APPLICATION) && (task != null)
&& (task.getMainWindowSizeChangeTransaction() != null)) {
mSurfaceController.deferTransactionUntil(mWin.getClientViewRootSurface(),
mWin.getFrameNumber());
SurfaceControl.mergeToGlobalTransaction(task.getMainWindowSizeChangeTransaction());