Merge "Remove toggle for display brightness apis." (87f867eb) · Commits · e / os / android_frameworks_native

services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp

+0 −10

Original line number	Diff line number	Diff line
		@@ -909,16 +909,6 @@ Error AidlComposer::setLayerPerFrameMetadataBlobs(

		Error AidlComposer::setDisplayBrightness(Display display, float brightness,
		const DisplayBrightnessOptions& options) {
		if (!options.sdrDimmingEnabled) {
		const auto status =
		mAidlComposerClient->setDisplayBrightness(translate<int64_t>(display), brightness);
		if (!status.isOk()) {
		ALOGE("setDisplayBrightness failed %s", status.getDescription().c_str());
		return static_cast<Error>(status.getServiceSpecificError());
		}
		return Error::NONE;
		}

		mWriter.setDisplayBrightness(translate<int64_t>(display), brightness);

		if (options.applyImmediately) {

services/surfaceflinger/DisplayHardware/ComposerHal.h

+1 −3

Original line number	Diff line number	Diff line
		@@ -213,11 +213,9 @@ public:
		// applyImmediately should only be false if OptionalFeature::DisplayBrightnessCommand is
		// supported.
		bool applyImmediately = true;
		bool sdrDimmingEnabled = true;

		bool operator==(const DisplayBrightnessOptions& other) const {
		return applyImmediately == other.applyImmediately &&
		sdrDimmingEnabled == other.sdrDimmingEnabled;
		return applyImmediately == other.applyImmediately;
		}
		};
		virtual Error setDisplayBrightness(Display display, float brightness,

services/surfaceflinger/SurfaceFlinger.cpp

+6 −13

Original line number	Diff line number	Diff line
		@@ -339,7 +339,6 @@ Dataspace SurfaceFlinger::defaultCompositionDataspace = Dataspace::V0_SRGB;
		ui::PixelFormat SurfaceFlinger::defaultCompositionPixelFormat = ui::PixelFormat::RGBA_8888;
		Dataspace SurfaceFlinger::wideColorGamutCompositionDataspace = Dataspace::V0_SRGB;
		ui::PixelFormat SurfaceFlinger::wideColorGamutCompositionPixelFormat = ui::PixelFormat::RGBA_8888;
		bool SurfaceFlinger::enableSdrDimming;
		LatchUnsignaledConfig SurfaceFlinger::enableLatchUnsignaledConfig;

		std::string decodeDisplayColorSetting(DisplayColorSetting displayColorSetting) {
		@@ -503,9 +502,6 @@ SurfaceFlinger::SurfaceFlinger(Factory& factory) : SurfaceFlinger(factory, SkipI

		mRefreshRateOverlaySpinner = property_get_bool("sf.debug.show_refresh_rate_overlay_spinner", 0);

		// Debug property overrides ro. property
		enableSdrDimming = property_get_bool("debug.sf.enable_sdr_dimming", enable_sdr_dimming(false));

		enableLatchUnsignaledConfig = getLatchUnsignaledConfig();

		mTransactionTracingEnabled =
		@@ -1704,10 +1700,7 @@ status_t SurfaceFlinger::setDisplayBrightness(const sp<IBinder>& displayToken,
		Hwc2::Composer::OptionalFeature::DisplayBrightnessCommand);
		// If we support applying display brightness as a command, then we also support
		// dimming SDR layers.
		// TODO(b/212634488): Once AIDL composer implementations are finalized, remove
		// the enableSdrDimming check, as dimming support will be expected for AIDL
		// composer.
		if (enableSdrDimming && supportsDisplayBrightnessCommand) {
		if (supportsDisplayBrightnessCommand) {
		display->getCompositionDisplay()
		->setDisplayBrightness(brightness.sdrWhitePointNits,
		brightness.displayBrightnessNits);
		@@ -1719,11 +1712,11 @@ status_t SurfaceFlinger::setDisplayBrightness(const sp<IBinder>& displayToken,
		}
		return ftl::yield<status_t>(OK);
		} else {
		return getHwComposer().setDisplayBrightness(
		display->getPhysicalId(), brightness.displayBrightness,
		Hwc2::Composer::DisplayBrightnessOptions{.applyImmediately = true,
		.sdrDimmingEnabled =
		enableSdrDimming});
		return getHwComposer()
		.setDisplayBrightness(display->getPhysicalId(),
		brightness.displayBrightness,
		Hwc2::Composer::DisplayBrightnessOptions{
		.applyImmediately = true});
		}

		} else {

services/surfaceflinger/SurfaceFlinger.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -252,10 +252,6 @@ public:

		static constexpr SkipInitializationTag SkipInitialization;

		// Whether or not SDR layers should be dimmed to the desired SDR white point instead of
		// being treated as native display brightness
		static bool enableSdrDimming;

		static LatchUnsignaledConfig enableLatchUnsignaledConfig;

		// must be called before clients can connect