Merge "Fix surface tracing thread sync issues" (1dc674b0) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/SurfaceFlinger.cpp

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1801,6 +1801,12 @@ void SurfaceFlinger::handleMessageRefresh() {
	mVsyncModulator.onRefreshed(mHadClientComposition);		mVsyncModulator.onRefreshed(mHadClientComposition);

	mLayersWithQueuedFrames.clear();		mLayersWithQueuedFrames.clear();
			if (mVisibleRegionsDirty) {
			mVisibleRegionsDirty = false;
			if (mTracingEnabled) {
			mTracing.notify("visibleRegionsDirty");
			}
			}
	}		}


	@@ -1810,9 +1816,6 @@ bool SurfaceFlinger::handleMessageInvalidate() {

	if (mVisibleRegionsDirty) {		if (mVisibleRegionsDirty) {
	computeLayerBounds();		computeLayerBounds();
	if (mTracingEnabled) {
	mTracing.notify("visibleRegionsDirty");
	}
	}		}

	for (auto& layer : mLayersPendingRefresh) {		for (auto& layer : mLayersPendingRefresh) {
	@@ -2214,7 +2217,6 @@ void SurfaceFlinger::rebuildLayerStacks() {
	// rebuild the visible layer list per screen		// rebuild the visible layer list per screen
	if (CC_UNLIKELY(mVisibleRegionsDirty)) {		if (CC_UNLIKELY(mVisibleRegionsDirty)) {
	ATRACE_NAME("rebuildLayerStacks VR Dirty");		ATRACE_NAME("rebuildLayerStacks VR Dirty");
	mVisibleRegionsDirty = false;
	invalidateHwcGeometry();		invalidateHwcGeometry();

	for (const auto& pair : mDisplays) {		for (const auto& pair : mDisplays) {