Merge "Unset sync group if sync state does not set" into main (35958bc9) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/ActivityRecord.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -11154,8 +11154,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
	boolean cancel) {		boolean cancel) {
	// This override is just for getting metrics. allFinished needs to be checked before		// This override is just for getting metrics. allFinished needs to be checked before
	// finish because finish resets all the states.		// finish because finish resets all the states.
	final BLASTSyncEngine.SyncGroup syncGroup = getSyncGroup();		if (isDifferentSyncGroup(group)) return;
	if (syncGroup != null && group != getSyncGroup()) return;
	mLastAllReadyAtSync = allSyncFinished();		mLastAllReadyAtSync = allSyncFinished();
	super.finishSync(outMergedTransaction, group, cancel);		super.finishSync(outMergedTransaction, group, cancel);
	}		}

services/core/java/com/android/server/wm/BLASTSyncEngine.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -348,6 +348,11 @@ class BLASTSyncEngine {
	wc.setSyncGroup(this);		wc.setSyncGroup(this);
	}		}
	wc.prepareSync();		wc.prepareSync();
			if (wc.mSyncState == WindowContainer.SYNC_STATE_NONE && wc.mSyncGroup != null) {
			Slog.w(TAG, "addToSync: unset SyncGroup " + wc.mSyncGroup.mSyncId
			+ " for non-sync " + wc);
			wc.mSyncGroup = null;
			}
	if (mReady) {		if (mReady) {
	mWm.mWindowPlacerLocked.requestTraversal();		mWm.mWindowPlacerLocked.requestTraversal();
	}		}

services/core/java/com/android/server/wm/WindowContainer.java

+21 −4

Original line number	Original line	Diff line number	Diff line
	@@ -3985,6 +3985,19 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
	return mSyncState != SYNC_STATE_NONE;		return mSyncState != SYNC_STATE_NONE;
	}		}

			/**
			* Returns {@code true} if this window container belongs to a different sync group than the
			* given group.
			*/
			boolean isDifferentSyncGroup(@Nullable BLASTSyncEngine.SyncGroup group) {
			if (group == null) return false;
			final BLASTSyncEngine.SyncGroup thisGroup = getSyncGroup();
			if (thisGroup == null \|\| group == thisGroup) return false;
			Slog.d(TAG, this + " uses a different SyncGroup, current=" + thisGroup.mSyncId
			+ " given=" + group.mSyncId);
			return true;
			}

	/**		/**
	* Recursively finishes/cleans-up sync state of this subtree and collects all the sync		* Recursively finishes/cleans-up sync state of this subtree and collects all the sync
	* transactions into `outMergedTransaction`.		* transactions into `outMergedTransaction`.
	@@ -3994,10 +4007,14 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
	*/		*/
	void finishSync(Transaction outMergedTransaction, @Nullable BLASTSyncEngine.SyncGroup group,		void finishSync(Transaction outMergedTransaction, @Nullable BLASTSyncEngine.SyncGroup group,
	boolean cancel) {		boolean cancel) {
	if (mSyncState == SYNC_STATE_NONE) return;		if (mSyncState == SYNC_STATE_NONE) {
	final BLASTSyncEngine.SyncGroup syncGroup = getSyncGroup();		if (mSyncGroup != null) {
	// If it's null, then we need to clean-up anyways.		Slog.e(TAG, "finishSync: stale group " + mSyncGroup.mSyncId + " of " + this);
	if (syncGroup != null && group != syncGroup) return;		mSyncGroup = null;
			}
			return;
			}
			if (isDifferentSyncGroup(group)) return;
	ProtoLog.v(WM_DEBUG_SYNC_ENGINE, "finishSync cancel=%b for %s", cancel, this);		ProtoLog.v(WM_DEBUG_SYNC_ENGINE, "finishSync cancel=%b for %s", cancel, this);
	outMergedTransaction.merge(mSyncTransaction);		outMergedTransaction.merge(mSyncTransaction);
	for (int i = mChildren.size() - 1; i >= 0; --i) {		for (int i = mChildren.size() - 1; i >= 0; --i) {

services/core/java/com/android/server/wm/WindowState.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5797,8 +5797,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
	@Override		@Override
	void finishSync(Transaction outMergedTransaction, BLASTSyncEngine.SyncGroup group,		void finishSync(Transaction outMergedTransaction, BLASTSyncEngine.SyncGroup group,
	boolean cancel) {		boolean cancel) {
	final BLASTSyncEngine.SyncGroup syncGroup = getSyncGroup();		if (isDifferentSyncGroup(group)) return;
	if (syncGroup != null && group != syncGroup) return;
	mPrepareSyncSeqId = 0;		mPrepareSyncSeqId = 0;
	if (cancel) {		if (cancel) {
	// This is leaving sync so any buffers left in the sync have a chance of		// This is leaving sync so any buffers left in the sync have a chance of

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

+21 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,7 @@ import static com.android.server.wm.WindowState.BLAST_TIMEOUT_DURATION;

	import static org.junit.Assert.assertEquals;		import static org.junit.Assert.assertEquals;
	import static org.junit.Assert.assertFalse;		import static org.junit.Assert.assertFalse;
			import static org.junit.Assert.assertNull;
	import static org.junit.Assert.assertTrue;		import static org.junit.Assert.assertTrue;
	import static org.mockito.ArgumentMatchers.any;		import static org.mockito.ArgumentMatchers.any;
	import static org.mockito.ArgumentMatchers.anyInt;		import static org.mockito.ArgumentMatchers.anyInt;
	@@ -416,6 +417,22 @@ public class SyncEngineTests extends WindowTestsBase {
	assertEquals(SYNC_STATE_NONE, botChildWC.mSyncState);		assertEquals(SYNC_STATE_NONE, botChildWC.mSyncState);
	}		}

			@Test
			public void testSkipPrepareSync() {
			final TestWindowContainer wc = new TestWindowContainer(mWm, true /* waiter */);
			wc.mSkipPrepareSync = true;
			final BLASTSyncEngine bse = createTestBLASTSyncEngine();
			final BLASTSyncEngine.SyncGroup syncGroup = bse.prepareSyncSet(
			mock(BLASTSyncEngine.TransactionReadyListener.class), "test");
			bse.startSyncSet(syncGroup);
			bse.addToSyncSet(syncGroup.mSyncId, wc);
			assertEquals(SYNC_STATE_NONE, wc.mSyncState);
			// If the implementation of prepareSync doesn't set sync state, the sync group should also
			// be empty.
			assertNull(wc.mSyncGroup);
			assertTrue(wc.isSyncFinished(syncGroup));
			}

	@Test		@Test
	public void testNonBlastMethod() {		public void testNonBlastMethod() {
	mAppWindow = createWindow(null, TYPE_BASE_APPLICATION, "mAppWindow");		mAppWindow = createWindow(null, TYPE_BASE_APPLICATION, "mAppWindow");
	@@ -694,6 +711,7 @@ public class SyncEngineTests extends WindowTestsBase {
	final boolean mWaiter;		final boolean mWaiter;
	boolean mVisibleRequested = true;		boolean mVisibleRequested = true;
	boolean mFillsParent = false;		boolean mFillsParent = false;
			boolean mSkipPrepareSync = false;

	TestWindowContainer(WindowManagerService wms, boolean waiter) {		TestWindowContainer(WindowManagerService wms, boolean waiter) {
	super(wms);		super(wms);
	@@ -703,6 +721,9 @@ public class SyncEngineTests extends WindowTestsBase {

	@Override		@Override
	boolean prepareSync() {		boolean prepareSync() {
			if (mSkipPrepareSync) {
			return false;
			}
	if (!super.prepareSync()) {		if (!super.prepareSync()) {
	return false;		return false;
	}		}