Merge "SF: change active config when 90Hz flag is on." (74fe9547) · Commits · e / os / android_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+16 −6

Original line number	Original line	Diff line number	Diff line
	@@ -576,9 +576,24 @@ void SurfaceFlinger::bootFinished()
	LOG_EVENT_LONG(LOGTAG_SF_STOP_BOOTANIM,		LOG_EVENT_LONG(LOGTAG_SF_STOP_BOOTANIM,
	ns2ms(systemTime(SYSTEM_TIME_MONOTONIC)));		ns2ms(systemTime(SYSTEM_TIME_MONOTONIC)));

	postMessageAsync(new LambdaMessage([this] {		postMessageAsync(new LambdaMessage([this]() NO_THREAD_SAFETY_ANALYSIS {
	readPersistentProperties();		readPersistentProperties();
	mBootStage = BootStage::FINISHED;		mBootStage = BootStage::FINISHED;

			// TODO(b/122905403): Once the display policy is completely integrated, this flag should go
			// away and it should be controlled by flipping the switch in setting. The switch in
			// settings should only be available to P19 devices, if they are opted into 90Hz fishfood.
			// The boot must be complete before we can set the active config.

			if (mUse90Hz) {
			mPhaseOffsets->setRefreshRateType(
			scheduler::RefreshRateConfigs::RefreshRateType::PERFORMANCE);
			setRefreshRateTo(RefreshRateType::PERFORMANCE);
			} else {
			mPhaseOffsets->setRefreshRateType(
			scheduler::RefreshRateConfigs::RefreshRateType::DEFAULT);
			setRefreshRateTo(RefreshRateType::DEFAULT);
			}
	}));		}));
	}		}

	@@ -635,11 +650,6 @@ void SurfaceFlinger::init() {
	mVsyncModulator.setSchedulerAndHandles(mScheduler.get(), mAppConnectionHandle.get(),		mVsyncModulator.setSchedulerAndHandles(mScheduler.get(), mAppConnectionHandle.get(),
	mSfConnectionHandle.get());		mSfConnectionHandle.get());

	if (mUse90Hz) {
	mPhaseOffsets->setRefreshRateType(
	scheduler::RefreshRateConfigs::RefreshRateType::PERFORMANCE);
	}

	// Get a RenderEngine for the given display / config (can't fail)		// Get a RenderEngine for the given display / config (can't fail)
	int32_t renderEngineFeature = 0;		int32_t renderEngineFeature = 0;
	renderEngineFeature \|= (useColorManagement ?		renderEngineFeature \|= (useColorManagement ?