Merge "Lazy initialize the choreographer" into sc-dev am: cacddc52aa am: d04e504e3e (eb0ffeda) · Commits · e / os / android_frameworks_base

packages/SystemUI/shared/src/com/android/systemui/shared/tracing/FrameProtoTracer.java

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -49,7 +49,7 @@ public class FrameProtoTracer<P, S extends P, T extends P, R>
	private final TraceBuffer<P, S, T> mBuffer;		private final TraceBuffer<P, S, T> mBuffer;
	private final File mTraceFile;		private final File mTraceFile;
	private final ProtoTraceParams<P, S, T, R> mParams;		private final ProtoTraceParams<P, S, T, R> mParams;
	private final Choreographer mChoreographer;		private Choreographer mChoreographer;
	private final Queue<T> mPool = new LinkedList<>();		private final Queue<T> mPool = new LinkedList<>();
	private final ArrayList<ProtoTraceable<R>> mTraceables = new ArrayList<>();		private final ArrayList<ProtoTraceable<R>> mTraceables = new ArrayList<>();
	private final ArrayList<ProtoTraceable<R>> mTmpTraceables = new ArrayList<>();		private final ArrayList<ProtoTraceable<R>> mTmpTraceables = new ArrayList<>();
	@@ -94,7 +94,6 @@ public class FrameProtoTracer<P, S extends P, T extends P, R>
	}		}
	});		});
	mTraceFile = params.getTraceFile();		mTraceFile = params.getTraceFile();
	mChoreographer = Choreographer.getMainThreadInstance();
	}		}

	public void start() {		public void start() {
	@@ -140,6 +139,9 @@ public class FrameProtoTracer<P, S extends P, T extends P, R>
	}		}

	// Schedule an update on the next frame		// Schedule an update on the next frame
			if (mChoreographer == null) {
			mChoreographer = Choreographer.getMainThreadInstance();
			}
	mChoreographer.postFrameCallback(this);		mChoreographer.postFrameCallback(this);
	mFrameScheduled = true;		mFrameScheduled = true;
	}		}