Merge "Call mergeWithNextTransaction in registerCallbacksForSync" into main (82516899) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+11 −1

Original line number	Diff line number	Diff line
		@@ -11612,7 +11612,14 @@ public final class ViewRootImpl implements ViewParent,
		Log.d(mTag, "registerCallbacksForSync syncBuffer=" + syncBuffer);
		}

		surfaceSyncGroup.addTransaction(mPendingTransaction);
		final Transaction t;
		if (mHasPendingTransactions) {
		t = new Transaction();
		t.merge(mPendingTransaction);
		} else {
		t = null;
		}

		mAttachInfo.mThreadedRenderer.registerRtFrameCallback(new FrameDrawingCallback() {
		@Override
		public void onFrameDraw(long frame) {
		@@ -11625,6 +11632,9 @@ public final class ViewRootImpl implements ViewParent,
		"Received frameDrawingCallback syncResult=" + syncResult + " frameNum="
		+ frame + ".");
		}
		if (t != null) {
		mergeWithNextTransaction(t, frame);
		}

		// If the syncResults are SYNC_LOST_SURFACE_REWARD_IF_FOUND or
		// SYNC_CONTEXT_IS_STOPPED it means nothing will draw. There's no need to set up