diff options
5 files changed, 11 insertions, 48 deletions
diff --git a/services/core/java/com/android/server/display/BrightnessRangeController.java b/services/core/java/com/android/server/display/BrightnessRangeController.java index 83b0801ce87f..50d650855b05 100644 --- a/services/core/java/com/android/server/display/BrightnessRangeController.java +++ b/services/core/java/com/android/server/display/BrightnessRangeController.java @@ -37,7 +37,6 @@ class BrightnessRangeController { private final HdrClamper mHdrClamper; private final Runnable mModeChangeCallback; - private final boolean mUseNbmController; private final boolean mUseHdrClamper; @@ -62,11 +61,8 @@ class BrightnessRangeController { mHdrClamper = hdrClamper; mNormalBrightnessModeController = normalBrightnessModeController; mUseHdrClamper = flags.isHdrClamperEnabled() && !flags.useNewHdrBrightnessModifier(); - mUseNbmController = flags.isNbmControllerEnabled(); - if (mUseNbmController) { - mNormalBrightnessModeController.resetNbmData( - displayDeviceConfig.getLuxThrottlingData()); - } + mNormalBrightnessModeController.resetNbmData( + displayDeviceConfig.getLuxThrottlingData()); if (flags.useNewHdrBrightnessModifier()) { // HDR boost is handled by HdrBrightnessModifier and should be disabled in HbmController mHbmController.disableHdrBoost(); @@ -76,7 +72,6 @@ class BrightnessRangeController { void dump(PrintWriter pw) { pw.println("BrightnessRangeController:"); - pw.println(" mUseNormalBrightnessController=" + mUseNbmController); pw.println(" mUseHdrClamper=" + mUseHdrClamper); mHbmController.dump(pw); mNormalBrightnessModeController.dump(pw); @@ -138,9 +133,7 @@ class BrightnessRangeController { float getCurrentBrightnessMax() { // nbmController might adjust maxBrightness only if device does not support HBM or // hbm is currently not allowed - if (mUseNbmController - && (!mHbmController.deviceSupportsHbm() - || !mHbmController.isHbmCurrentlyAllowed())) { + if (!mHbmController.deviceSupportsHbm() || !mHbmController.isHbmCurrentlyAllowed()) { return Math.min(mHbmController.getCurrentBrightnessMax(), mNormalBrightnessModeController.getCurrentBrightnessMax()); } @@ -173,16 +166,12 @@ class BrightnessRangeController { } private void applyChanges(BooleanSupplier nbmChangesFunc, Runnable hbmChangesFunc) { - if (mUseNbmController) { - boolean nbmTransitionChanged = nbmChangesFunc.getAsBoolean(); - hbmChangesFunc.run(); - // if nbm transition changed - trigger callback - // HighBrightnessModeController handles sending changes itself - if (nbmTransitionChanged) { - mModeChangeCallback.run(); - } - } else { - hbmChangesFunc.run(); + boolean nbmTransitionChanged = nbmChangesFunc.getAsBoolean(); + hbmChangesFunc.run(); + // if nbm transition changed - trigger callback + // HighBrightnessModeController handles sending changes itself + if (nbmTransitionChanged) { + mModeChangeCallback.run(); } } diff --git a/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java b/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java index 585fc44fa452..47774600a9b9 100644 --- a/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java +++ b/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java @@ -46,10 +46,6 @@ public class DisplayManagerFlags { Flags.FLAG_ENABLE_CONNECTED_DISPLAY_MANAGEMENT, Flags::enableConnectedDisplayManagement); - private final FlagState mNbmControllerFlagState = new FlagState( - Flags.FLAG_ENABLE_NBM_CONTROLLER, - Flags::enableNbmController); - private final FlagState mHdrClamperFlagState = new FlagState( Flags.FLAG_ENABLE_HDR_CLAMPER, Flags::enableHdrClamper); @@ -278,11 +274,6 @@ public class DisplayManagerFlags { return mConnectedDisplayManagementFlagState.isEnabled(); } - /** Returns whether NBM Controller is enabled or not. */ - public boolean isNbmControllerEnabled() { - return mNbmControllerFlagState.isEnabled(); - } - /** Returns whether hdr clamper is enabled on not. */ public boolean isHdrClamperEnabled() { return mHdrClamperFlagState.isEnabled(); @@ -587,7 +578,6 @@ public class DisplayManagerFlags { pw.println(" " + mExternalDisplayLimitModeState); pw.println(" " + mDisplayTopology); pw.println(" " + mHdrClamperFlagState); - pw.println(" " + mNbmControllerFlagState); pw.println(" " + mPowerThrottlingClamperFlagState); pw.println(" " + mEvenDimmerFlagState); pw.println(" " + mSmallAreaDetectionFlagState); diff --git a/services/core/java/com/android/server/display/feature/display_flags.aconfig b/services/core/java/com/android/server/display/feature/display_flags.aconfig index 123b7dfbf843..3358f723709c 100644 --- a/services/core/java/com/android/server/display/feature/display_flags.aconfig +++ b/services/core/java/com/android/server/display/feature/display_flags.aconfig @@ -37,14 +37,6 @@ flag { } flag { - name: "enable_nbm_controller" - namespace: "display_manager" - description: "Feature flag for Normal Brightness Mode Controller" - bug: "299527549" - is_fixed_read_only: true -} - -flag { name: "enable_hdr_clamper" namespace: "display_manager" description: "Feature flag for HDR Clamper" diff --git a/services/tests/displayservicetests/src/com/android/server/display/BrightnessRangeControllerTest.kt b/services/tests/displayservicetests/src/com/android/server/display/BrightnessRangeControllerTest.kt index f589a2c9385c..7db6ea0bf86d 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/BrightnessRangeControllerTest.kt +++ b/services/tests/displayservicetests/src/com/android/server/display/BrightnessRangeControllerTest.kt @@ -60,12 +60,6 @@ class BrightnessRangeControllerTest { } @Test - fun testMaxBrightness_HbmDisabledAndNotAllowed() { - val controller = createController(nbmEnabled = false, hbmAllowed = false) - assertThat(controller.currentBrightnessMax).isEqualTo(MAX_BRIGHTNESS) - } - - @Test fun testMaxBrightness_transitionPointLessThanCurrentNbmLimit() { val controller = createController( hbmAllowed = false, @@ -76,13 +70,11 @@ class BrightnessRangeControllerTest { } private fun createController( - nbmEnabled: Boolean = true, hbmSupported: Boolean = true, hbmAllowed: Boolean = true, hbmMaxBrightness: Float = MAX_BRIGHTNESS, nbmMaxBrightness: Float = NORMAL_BRIGHTNESS_LOW ): BrightnessRangeController { - whenever(mockFlags.isNbmControllerEnabled).thenReturn(nbmEnabled) whenever(mockHbmController.deviceSupportsHbm()).thenReturn(hbmSupported) whenever(mockHbmController.isHbmCurrentlyAllowed).thenReturn(hbmAllowed) whenever(mockHbmController.currentBrightnessMax).thenReturn(hbmMaxBrightness) diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java index 8ca39194de3b..a4dfecb8ed96 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java @@ -2626,8 +2626,8 @@ public final class DisplayPowerControllerTest { mock(ScreenOffBrightnessSensorController.class); final HighBrightnessModeController hbmController = mock(HighBrightnessModeController.class); final HdrClamper hdrClamper = mock(HdrClamper.class); - final NormalBrightnessModeController normalBrightnessModeController = mock( - NormalBrightnessModeController.class); + final NormalBrightnessModeController normalBrightnessModeController = + new NormalBrightnessModeController(); BrightnessClamperController clamperController = mock(BrightnessClamperController.class); when(hbmController.getCurrentBrightnessMax()).thenReturn(PowerManager.BRIGHTNESS_MAX); |