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

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

Browse Source
This commit is contained in:
Hongwei Wang
2020-04-22 23:26:19 +00:00
committed by Android (Google) Code Review
parent 42199418fd ed98ad9797
commit 8e4db5802f
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/WindowStateAnimator.java
View File

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