diff --git a/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp b/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp
index 34f5a39..d253b00 100644
--- a/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp
+++ b/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp
@@ -909,16 +909,6 @@
 
 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) {
diff --git a/services/surfaceflinger/DisplayHardware/ComposerHal.h b/services/surfaceflinger/DisplayHardware/ComposerHal.h
index e492997..718208b 100644
--- a/services/surfaceflinger/DisplayHardware/ComposerHal.h
+++ b/services/surfaceflinger/DisplayHardware/ComposerHal.h
@@ -213,11 +213,9 @@
         // 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,
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 58f2ab6..ad9bede 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -339,7 +339,6 @@
 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 @@
 
     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 @@
                                    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 @@
                        }
                        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 {
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 007eb9f..d9147bb 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -252,10 +252,6 @@
 
     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