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

Merge "setBoundsChangeTransaction: Fix two issues" into rvc-dev am: c46f3e0fb5

Browse Source 
Change-Id: I8034ad1feca8895fef2d0238dcce755179d261ec
This commit is contained in:
Wale Ogunwale
2020-05-07 13:51:50 +00:00
committed by Automerger Merge Worker
parent 297ac99344 c46f3e0fb5
commit b1c1abd1d3
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/wm/WindowStateAnimator.java
View File

@@ -846,6 +846,23 @@ class WindowStateAnimator {
}
}
private boolean shouldConsumeMainWindowSizeTransaction() {
// We only consume the transaction when the client is calling relayout
// because this is the only time we know the frameNumber will be valid
// due to the client renderer being paused. Put otherwise, only when
// mInRelayout is true can we guarantee the next frame will contain
// the most recent configuration.
if (!mWin.mInRelayout) return false;
// Since we can only do this for one window, we focus on the main application window
if (mAttrType != TYPE_BASE_APPLICATION) return false;
final Task task = mWin.getTask();
if (task == null) return false;
if (task.getMainWindowSizeChangeTransaction() == null) return false;
// Likewise we only focus on the task root, since we can only use one window
if (!mWin.mActivityRecord.isRootOfTask()) return false;
return true;
}
void setSurfaceBoundariesLocked(final boolean recoveringMemory) {
if (mSurfaceController == null) {
return;
@@ -886,8 +903,9 @@ class WindowStateAnimator {
clipRect = mTmpClipRect;
}
if (w.mInRelayout && (mAttrType == TYPE_BASE_APPLICATION) && (task != null)
&& (task.getMainWindowSizeChangeTransaction() != null)) {
if (shouldConsumeMainWindowSizeTransaction()) {
task.getSurfaceControl().deferTransactionUntil(mWin.getClientViewRootSurface(),
mWin.getFrameNumber());
mSurfaceController.deferTransactionUntil(mWin.getClientViewRootSurface(),
mWin.getFrameNumber());
SurfaceControl.mergeToGlobalTransaction(task.getMainWindowSizeChangeTransaction());