Merge "Removing enable_nbm_controller flag" into main (76b9ba62) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/BrightnessRangeController.java

+9 −20

Original line number	Diff line number	Diff line
		@@ -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());
		}
		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,7 +166,6 @@ class BrightnessRangeController {
		}

		private void applyChanges(BooleanSupplier nbmChangesFunc, Runnable hbmChangesFunc) {
		if (mUseNbmController) {
		boolean nbmTransitionChanged = nbmChangesFunc.getAsBoolean();
		hbmChangesFunc.run();
		// if nbm transition changed - trigger callback
		@@ -181,9 +173,6 @@ class BrightnessRangeController {
		if (nbmTransitionChanged) {
		mModeChangeCallback.run();
		}
		} else {
		hbmChangesFunc.run();
		}
		}

		public float getHdrTransitionRate() {

services/core/java/com/android/server/display/feature/DisplayManagerFlags.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -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);
		@@ -282,11 +278,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();
		@@ -595,7 +586,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);

services/core/java/com/android/server/display/feature/display_flags.aconfig

+0 −8

Original line number	Diff line number	Diff line
		@@ -36,14 +36,6 @@ flag {
		is_fixed_read_only: true
		}

		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"

services/tests/displayservicetests/src/com/android/server/display/BrightnessRangeControllerTest.kt

+0 −8

Original line number	Diff line number	Diff line
		@@ -59,12 +59,6 @@ class BrightnessRangeControllerTest {
		assertThat(controller.currentBrightnessMax).isEqualTo(NORMAL_BRIGHTNESS_LOW)
		}

		@Test
		fun testMaxBrightness_HbmDisabledAndNotAllowed() {
		val controller = createController(nbmEnabled = false, hbmAllowed = false)
		assertThat(controller.currentBrightnessMax).isEqualTo(MAX_BRIGHTNESS)
		}

		@Test
		fun testMaxBrightness_transitionPointLessThanCurrentNbmLimit() {
		val controller = createController(
		@@ -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)

services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);