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 am: 8e4db5802f

Browse Source 
Change-Id: Ie6af91aa90a0b676f3641d2270fcba13dbbfc26c
This commit is contained in:
Hongwei Wang
2020-04-22 23:44:59 +00:00
committed by Automerger Merge Worker
parent 3a7eacedfc 8e4db5802f
commit 287570ab94
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;
}
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());