Merge "SurfaceFlinger: set the refresh rate on overlay when calling to hwc" into sc-dev (64812298) · Commits · e / devices / smdk4412 / android_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -1029,10 +1029,6 @@ void SurfaceFlinger::setDesiredActiveMode(const ActiveModeInfo& info) {
		updatePhaseConfiguration(refreshRate.getFps());
		mScheduler->setModeChangePending(true);
		}

		if (mRefreshRateOverlay) {
		mRefreshRateOverlay->changeRefreshRate(refreshRate.getFps());
		}
		}

		status_t SurfaceFlinger::setActiveMode(const sp<IBinder>& displayToken, int modeId) {
		@@ -1190,6 +1186,10 @@ void SurfaceFlinger::performSetActiveMode() {
		}

		mScheduler->onNewVsyncPeriodChangeTimeline(outTimeline);
		if (mRefreshRateOverlay) {
		mRefreshRateOverlay->changeRefreshRate(desiredMode->getFps());
		}

		// Scheduler will submit an empty frame to HWC if needed.
		mSetActiveModePending = true;
		}