Merge "SurfaceFlinger: use isDisplayConfigAllowed in dumpVSync()" (f553e330) · Commits · e / os / android_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+4 −6

Original line number	Diff line number	Diff line
		@@ -1477,7 +1477,7 @@ void SurfaceFlinger::getCompositorTiming(CompositorTiming* compositorTiming) {
		*compositorTiming = getBE().mCompositorTiming;
		}

		bool SurfaceFlinger::isDisplayConfigAllowed(int32_t configId) {
		bool SurfaceFlinger::isDisplayConfigAllowed(int32_t configId) const {
		return mAllowedDisplayConfigs.empty() \|\| mAllowedDisplayConfigs.count(configId);
		}

		@@ -4710,13 +4710,11 @@ void SurfaceFlinger::dumpVSync(std::string& result) const {
		StringAppendF(&result, "+ Smart 90 for video detection: %s\n\n",
		mUseSmart90ForVideo ? "on" : "off");
		StringAppendF(&result, "Allowed Display Configs: ");
		for (int32_t configId : mAllowedDisplayConfigs) {
		for (auto refresh : mRefreshRateConfigs.getRefreshRates()) {
		if (refresh.second && refresh.second->configId == configId) {
		if (refresh.second && isDisplayConfigAllowed(refresh.second->configId)) {
		StringAppendF(&result, "%dHz, ", refresh.second->fps);
		}
		}
		}
		StringAppendF(&result, "(config override by backdoor: %s)\n\n",
		mDebugDisplayConfigSetByBackdoor ? "yes" : "no");
		mScheduler->dump(mAppConnectionHandle, result);

+1 −1

Original line number	Diff line number	Diff line
		@@ -813,7 +813,7 @@ private:
		// the desired refresh rate.
		void setRefreshRateTo(RefreshRateType, Scheduler::ConfigEvent event) REQUIRES(mStateLock);

		bool isDisplayConfigAllowed(int32_t configId) REQUIRES(mStateLock);
		bool isDisplayConfigAllowed(int32_t configId) const REQUIRES(mStateLock);

		/*
		* Display identification