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

Merge "Finish sync for unchanged drawn window" into tm-qpr-dev am: 719029c87c am: 4d9d3883fa

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20783091

Change-Id: I74b4a6d53c8f76745c22a347ed8c844198c18c74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2023-01-06 13:49:36 +00:00
committed by Automerger Merge Worker
parent 21207f26fa 4d9d3883fa
commit ea5ef0018a
5 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/WindowContainer.java
View File

@@ -3791,7 +3791,6 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
if (mSyncState == SYNC_STATE_NONE) return false;
mSyncState = SYNC_STATE_READY;
mSyncMethodOverride = BLASTSyncEngine.METHOD_UNDEFINED;
mWmService.mWindowPlacerLocked.requestTraversal();
ProtoLog.v(WM_DEBUG_SYNC_ENGINE, "onSyncFinishedDrawing %s", this);
return true;
}
@@ -3861,8 +3860,8 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
/**
* Checks if the subtree rooted at this container is finished syncing (everything is ready or
* not visible). NOTE, this is not const: it will cancel/prepare itself depending on its state
* in the hierarchy.
* not visible). NOTE, this is not const: it may cancel/prepare/complete itself depending on
* its state in the hierarchy.
*
* @return {@code true} if this subtree is finished waiting for sync participants.
*/

6
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -2563,12 +2563,6 @@ public class WindowManagerService extends IWindowManager.Stub
&& win.mSyncSeqId > lastSyncSeqId) {
maybeSyncSeqId = win.shouldSyncWithBuffers() ? win.mSyncSeqId : -1;
win.markRedrawForSyncReported();
if (win.mSyncState == WindowContainer.SYNC_STATE_WAITING_FOR_DRAW
&& winAnimator.mDrawState == WindowStateAnimator.HAS_DRAWN
&& maybeSyncSeqId < 0) {
// Do not wait for a drawn window which won't report draw.
win.onSyncFinishedDrawing();
}
} else {
maybeSyncSeqId = -1;
}

15
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -5957,12 +5957,16 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
@Override
boolean isSyncFinished() {
if (mSyncState == SYNC_STATE_WAITING_FOR_DRAW && mViewVisibility != View.VISIBLE
&& !isVisibleRequested()) {
if (!isVisibleRequested()) {
// Don't wait for invisible windows. However, we don't alter the state in case the
// window becomes visible while the sync group is still active.
return true;
}
if (mSyncState == SYNC_STATE_WAITING_FOR_DRAW && mWinAnimator.mDrawState == HAS_DRAWN
&& !mRedrawForSyncReported && !mWmService.mResizingWindows.contains(this)) {
// Complete the sync state immediately for a drawn window that doesn't need to redraw.
onSyncFinishedDrawing();
}
return super.isSyncFinished();
}
@@ -6013,6 +6017,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
final boolean hasSyncHandlers = executeDrawHandlers(postDrawTransaction, syncSeqId);
boolean skipLayout = false;
boolean layoutNeeded = false;
// Control the timing to switch the appearance of window with different rotations.
final AsyncRotationController asyncRotationController =
mDisplayContent.getAsyncRotationController();
@@ -6025,7 +6030,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
} else if (syncActive) {
// Currently in a Sync that is using BLAST.
if (!syncStillPending) {
onSyncFinishedDrawing();
layoutNeeded = onSyncFinishedDrawing();
}
if (postDrawTransaction != null) {
mSyncTransaction.merge(postDrawTransaction);
@@ -6034,10 +6039,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
}
} else if (useBLASTSync()) {
// Sync that is not using BLAST
onSyncFinishedDrawing();
layoutNeeded = onSyncFinishedDrawing();
}
final boolean layoutNeeded =
layoutNeeded |=
mWinAnimator.finishDrawingLocked(postDrawTransaction, mClientWasDrawingForSync);
mClientWasDrawingForSync = false;
// We always want to force a traversal after a finish draw for blast sync.

5
services/tests/wmtests/src/com/android/server/wm/SyncEngineTests.java
View File

@@ -31,6 +31,7 @@ import static com.android.server.wm.WindowState.BLAST_TIMEOUT_DURATION;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
@@ -108,9 +109,7 @@ public class SyncEngineTests extends WindowTestsBase {
bse.onSurfacePlacement();
verify(listener, times(0)).onTransactionReady(anyInt(), any());
mockWC.onSyncFinishedDrawing();
// Make sure the second traversal is requested.
verify(mWm.mWindowPlacerLocked, times(2)).requestTraversal();
assertTrue(mockWC.onSyncFinishedDrawing());
bse.onSurfacePlacement();
verify(listener, times(1)).onTransactionReady(eq(id), notNull());
}

3
services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java
View File

@@ -1238,7 +1238,8 @@ public class WindowOrganizerTests extends WindowTestsBase {
assertTrue(w1.useBLASTSync());
assertTrue(w2.useBLASTSync());
w1.immediatelyNotifyBlastSync();
// A drawn window can complete the sync state automatically.
w1.mWinAnimator.mDrawState = WindowStateAnimator.HAS_DRAWN;
mWm.mSyncEngine.onSurfacePlacement();
verify(mockCallback).onTransactionReady(anyInt(), any());
assertFalse(w1.useBLASTSync());