Merge "Trace transition and changes flags" into udc-dev (e691f596) · Commits · e / os / android_frameworks_base

core/proto/android/server/windowmanagertransitiontrace.proto

+2 −0

Original line number	Diff line number	Diff line
		@@ -55,12 +55,14 @@ message Transition {
		optional int64 finish_time_ns = 6; // consider aborted if not provided
		required int32 type = 7;
		repeated Target targets = 8;
		optional int32 flags = 9;
		}

		message Target {
		required int32 mode = 1;
		required int32 layer_id = 2;
		optional int32 window_id = 3; // Not dumped in always on tracing
		optional int32 flags = 4;
		}

		message TransitionState {

+3 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,7 @@ public class TransitionTracer {
		}

		outputStream.write(com.android.server.wm.shell.Transition.TYPE, transition.mType);
		outputStream.write(com.android.server.wm.shell.Transition.FLAGS, transition.getFlags());

		for (int i = 0; i < targets.size(); ++i) {
		final long changeToken = outputStream
		@@ -162,6 +163,7 @@ public class TransitionTracer {
		final Transition.ChangeInfo target = targets.get(i);

		final int mode = target.getTransitMode(target.mContainer);
		final int flags = target.getChangeFlags(target.mContainer);
		final int layerId;
		if (target.mContainer.mSurfaceControl.isValid()) {
		layerId = target.mContainer.mSurfaceControl.getLayerId();
		@@ -170,6 +172,7 @@ public class TransitionTracer {
		}

		outputStream.write(com.android.server.wm.shell.Target.MODE, mode);
		outputStream.write(com.android.server.wm.shell.Target.FLAGS, flags);
		outputStream.write(com.android.server.wm.shell.Target.LAYER_ID, layerId);

		if (mActiveTracingEnabled) {