Merge "Correctly resume profileRendering" (ccac8c95) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+16 −11

Original line number	Diff line number	Diff line
		@@ -2111,6 +2111,11 @@ public final class ViewRootImpl implements ViewParent,
		private void profileRendering(boolean enabled) {
		if (mProfileRendering) {
		mRenderProfilingEnabled = enabled;

		if (mRenderProfiler != null) {
		mChoreographer.removeFrameCallback(mRenderProfiler);
		}
		if (mRenderProfilingEnabled) {
		if (mRenderProfiler == null) {
		mRenderProfiler = new Choreographer.FrameCallback() {
		@Override
		@@ -2122,9 +2127,9 @@ public final class ViewRootImpl implements ViewParent,
		}
		}
		};
		}
		mChoreographer.postFrameCallback(mRenderProfiler);
		} else {
		mChoreographer.removeFrameCallback(mRenderProfiler);
		mRenderProfiler = null;
		}
		}