Merge "Rename mergedInto to mergeTarget for clarity" into main (c5b60871) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/proto/wm_shell_transition_trace.proto

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ message Transition {
		optional int32 handler = 3;
		optional int64 merge_time_ns = 4;
		optional int64 merge_request_time_ns = 5;
		optional int32 merged_into = 6;
		optional int32 merge_target = 6;
		optional int64 abort_time_ns = 7;
		}

+2 −3

Original line number	Diff line number	Diff line
		@@ -129,13 +129,12 @@ public class Tracer implements ShellCommandHandler.ShellCommandActionHandler {
		* Adds an entry in the trace to log that a request to merge a transition was made.
		*
		* @param mergeRequestedTransitionId The id of the transition we are requesting to be merged.
		* @param playingTransitionId The id of the transition we was to merge the transition into.
		*/
		public void logMergeRequested(int mergeRequestedTransitionId, int playingTransitionId) {
		com.android.wm.shell.nano.Transition proto = new com.android.wm.shell.nano.Transition();
		proto.id = mergeRequestedTransitionId;
		proto.mergeRequestTimeNs = SystemClock.elapsedRealtimeNanos();
		proto.mergedInto = playingTransitionId;
		proto.mergeTarget = playingTransitionId;

		mTraceBuffer.add(proto);
		}
		@@ -150,7 +149,7 @@ public class Tracer implements ShellCommandHandler.ShellCommandActionHandler {
		com.android.wm.shell.nano.Transition proto = new com.android.wm.shell.nano.Transition();
		proto.id = mergedTransitionId;
		proto.mergeTimeNs = SystemClock.elapsedRealtimeNanos();
		proto.mergedInto = playingTransitionId;
		proto.mergeTarget = playingTransitionId;

		mTraceBuffer.add(proto);
		}