Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 116ad8d1 authored Jan 28, 2021 by TreeHugger Robot Committed by Android (Google) Code Review Jan 28, 2021

Merge "SyncRtSurfaceTransactionApplier: Use BLASTSync" into sc-dev

parents 80bb0561 2b0b88aa

core/java/android/view/SyncRtSurfaceTransactionApplier.java

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -85,13 +85,14 @@ public class SyncRtSurfaceTransactionApplier {
	for (int i = params.length - 1; i >= 0; i--) {		for (int i = params.length - 1; i >= 0; i--) {
	SurfaceParams surfaceParams = params[i];		SurfaceParams surfaceParams = params[i];
	SurfaceControl surface = surfaceParams.surface;		SurfaceControl surface = surfaceParams.surface;
	if (frame > 0) {
	t.deferTransactionUntil(surface, mTargetSc, frame);
	}
	applyParams(t, surfaceParams, mTmpFloat9);		applyParams(t, surfaceParams, mTmpFloat9);
	}		}
			if (mTargetViewRootImpl != null) {
			mTargetViewRootImpl.mergeWithNextTransaction(t, frame);
			} else {
	t.apply();		t.apply();
	}		}
			}

	public static void applyParams(Transaction t, SurfaceParams params, float[] tmpFloat9) {		public static void applyParams(Transaction t, SurfaceParams params, float[] tmpFloat9) {
	if ((params.flags & FLAG_TRANSACTION) != 0) {		if ((params.flags & FLAG_TRANSACTION) != 0) {

core/java/android/view/ViewRootImpl.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10109,7 +10109,7 @@ public final class ViewRootImpl implements ViewParent,
	* Merges the transaction passed in with the next transaction in BLASTBufferQueue. This ensures		* Merges the transaction passed in with the next transaction in BLASTBufferQueue. This ensures
	* you can add transactions to the upcoming frame.		* you can add transactions to the upcoming frame.
	*/		*/
	void mergeWithNextTransaction(Transaction t, long frameNumber) {		public void mergeWithNextTransaction(Transaction t, long frameNumber) {
	if (mBlastBufferQueue != null) {		if (mBlastBufferQueue != null) {
	mBlastBufferQueue.mergeWithNextTransaction(t, frameNumber);		mBlastBufferQueue.mergeWithNextTransaction(t, frameNumber);
	}		}

packages/SystemUI/shared/src/com/android/systemui/shared/system/SyncRtSurfaceTransactionApplierCompat.java

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -114,10 +114,13 @@ public class SyncRtSurfaceTransactionApplierCompat {
	for (int i = params.length - 1; i >= 0; i--) {		for (int i = params.length - 1; i >= 0; i--) {
	SyncRtSurfaceTransactionApplierCompat.SurfaceParams surfaceParams =		SyncRtSurfaceTransactionApplierCompat.SurfaceParams surfaceParams =
	params[i];		params[i];
	t.deferTransactionUntil(surfaceParams.surface, mBarrierSurfaceControl, frame);
	surfaceParams.applyTo(t);		surfaceParams.applyTo(t);
	}		}
			if (mTargetViewRootImpl != null) {
			mTargetViewRootImpl.mergeWithNextTransaction(t, frame);
			} else {
	t.apply();		t.apply();
			}
	Trace.traceEnd(Trace.TRACE_TAG_VIEW);		Trace.traceEnd(Trace.TRACE_TAG_VIEW);
	Message.obtain(mApplyHandler, MSG_UPDATE_SEQUENCE_NUMBER, toApplySeqNo, 0)		Message.obtain(mApplyHandler, MSG_UPDATE_SEQUENCE_NUMBER, toApplySeqNo, 0)
	.sendToTarget();		.sendToTarget();

packages/SystemUI/shared/src/com/android/systemui/shared/system/ViewRootImplCompat.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -56,4 +56,12 @@ public class ViewRootImplCompat {
	});		});
	}		}
	}		}

			public void mergeWithNextTransaction(SurfaceControl.Transaction t, long frame) {
			if (mViewRoot != null) {
			mViewRoot.mergeWithNextTransaction(t, frame);
			} else {
			t.apply();
			}
			}
	}		}