Merge "Add temporary bbq merge path to SCR logs" into main (2d77156a) · Commits · e / os / android_frameworks_base

core/java/android/view/SurfaceControl.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -4524,6 +4524,21 @@ public final class SurfaceControl implements Parcelable {
		return this;
		}

		/**
		* TODO(b/366484871): To be removed once we have some logging in native
		* This is called when BlastBufferQueue.mergeWithNextTransaction() is called from java, and
		* for the purposes of logging that path.
		*/
		void onMergeWithNextTransaction(CharSequence windowName) {
		if (SurfaceControlRegistry.sCallStackDebuggingEnabled) {
		SurfaceControlRegistry.getProcessInstance().checkCallStackDebugging(
		"merge", this, null, "window=" + windowName);
		if (mCalls != null) {
		mCalls.clear();
		}
		}
		}

		/**
		* Equivalent to reparent with a null parent, in that it removes
		* the SurfaceControl from the scene, but it also releases

+4 −0

Original line number	Diff line number	Diff line
		@@ -12391,6 +12391,7 @@ public final class ViewRootImpl implements ViewParent,
		transaction.setBlurRegions(surfaceControl, regionCopy);

		if (mBlastBufferQueue != null) {
		transaction.onMergeWithNextTransaction(getTitle());
		mBlastBufferQueue.mergeWithNextTransaction(transaction, frameNumber);
		}
		}
		@@ -12417,6 +12418,9 @@ public final class ViewRootImpl implements ViewParent,
		*/
		public void mergeWithNextTransaction(Transaction t, long frameNumber) {
		if (mBlastBufferQueue != null) {
		if (t != null) {
		t.onMergeWithNextTransaction(getTitle());
		}
		mBlastBufferQueue.mergeWithNextTransaction(t, frameNumber);
		} else {
		t.apply();