Merge "SurfaceFlinger: generate invalidate after setActiveConfig" into qt-dev (7178a917) · Commits · e / os / android_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+2 −6

Original line number	Original line	Diff line number	Diff line
	@@ -980,7 +980,7 @@ bool SurfaceFlinger::performSetActiveConfig() {
	if (mPreviousPresentFence != Fence::NO_FENCE &&		if (mPreviousPresentFence != Fence::NO_FENCE &&
	(mPreviousPresentFence->getStatus() == Fence::Status::Unsignaled)) {		(mPreviousPresentFence->getStatus() == Fence::Status::Unsignaled)) {
	// fence has not signaled yet. wait for the next invalidate		// fence has not signaled yet. wait for the next invalidate
	repaintEverythingForHWC();		mEventQueue->invalidateForHWC();
	return true;		return true;
	}		}

	@@ -1031,7 +1031,7 @@ bool SurfaceFlinger::performSetActiveConfig() {

	// we need to submit an empty frame to HWC to start the process		// we need to submit an empty frame to HWC to start the process
	mCheckPendingFence = true;		mCheckPendingFence = true;
			mEventQueue->invalidateForHWC();
	return false;		return false;
	}		}

	@@ -1447,10 +1447,6 @@ void SurfaceFlinger::setRefreshRateTo(RefreshRateType refreshRate, Scheduler::Co
	return;		return;
	}		}

	if (desiredConfigId == display->getActiveConfig()) {
	return;
	}

	setDesiredActiveConfig({refreshRate, desiredConfigId, event});		setDesiredActiveConfig({refreshRate, desiredConfigId, event});
	}		}