Remove toggle for display brightness apis.

Sysfs and drm paths for setting brightness all occur as part of layer
commands, and the separate brightness api is being remove from the
composer definition, so remove support in the framework.

Bug: 210151839
Test: builds, boots
Test: Modulate display brightness slider
Change-Id: I115b9cfa373ccbd4c541c67a08f0fec13c0c95ab

1 files changed, 6 insertions, 13 deletions

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 58f2ab6049..ad9bede98d 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -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 =
@@ -1694,10 +1690,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);
@@ -1709,11 +1702,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 {