Merge "Removing enable_hdr_clamper flag" into main (86e03200) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ class BrightnessRangeController {
		mModeChangeCallback = modeChangeCallback;
		mHdrClamper = hdrClamper;
		mNormalBrightnessModeController = normalBrightnessModeController;
		mUseHdrClamper = flags.isHdrClamperEnabled() && !flags.useNewHdrBrightnessModifier();
		mUseHdrClamper = !flags.useNewHdrBrightnessModifier();
		mNormalBrightnessModeController.resetNbmData(
		displayDeviceConfig.getLuxThrottlingData());
		if (flags.useNewHdrBrightnessModifier()) {

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 mHdrClamperFlagState = new FlagState(
		Flags.FLAG_ENABLE_HDR_CLAMPER,
		Flags::enableHdrClamper);

		private final FlagState mAdaptiveToneImprovements1 = new FlagState(
		Flags.FLAG_ENABLE_ADAPTIVE_TONE_IMPROVEMENTS_1,
		Flags::enableAdaptiveToneImprovements1);
		@@ -278,11 +274,6 @@ public class DisplayManagerFlags {
		return mConnectedDisplayManagementFlagState.isEnabled();
		}

		/** Returns whether hdr clamper is enabled on not. */
		public boolean isHdrClamperEnabled() {
		return mHdrClamperFlagState.isEnabled();
		}

		/** Returns whether power throttling clamper is enabled on not. */
		public boolean isPowerThrottlingClamperEnabled() {
		return mPowerThrottlingClamperFlagState.isEnabled();
		@@ -585,7 +576,6 @@ public class DisplayManagerFlags {
		pw.println(" " + mDisplayOffloadFlagState);
		pw.println(" " + mExternalDisplayLimitModeState);
		pw.println(" " + mDisplayTopology);
		pw.println(" " + mHdrClamperFlagState);
		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_hdr_clamper"
		namespace: "display_manager"
		description: "Feature flag for HDR Clamper"
		bug: "295100043"
		is_fixed_read_only: true
		}

		flag {
		name: "enable_power_throttling_clamper"
		namespace: "display_manager"

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

+2 −24

Original line number	Diff line number	Diff line
		@@ -1400,34 +1400,10 @@ public final class DisplayPowerControllerTest {
		eq(BRIGHTNESS_RAMP_RATE_SLOW_INCREASE_IDLE), eq(false));
		}

		@Test
		public void testRampRateForHdrContent_HdrClamperOff() {
		float hdrBrightness = 0.8f;
		float clampedBrightness = 0.6f;
		float transitionRate = 1.5f;

		DisplayPowerRequest dpr = new DisplayPowerRequest();
		when(mHolder.displayPowerState.getColorFadeLevel()).thenReturn(1.0f);
		when(mHolder.displayPowerState.getScreenBrightness()).thenReturn(.2f);
		when(mHolder.displayPowerState.getSdrScreenBrightness()).thenReturn(.1f);
		when(mHolder.hbmController.getHighBrightnessMode()).thenReturn(
		BrightnessInfo.HIGH_BRIGHTNESS_MODE_HDR);
		when(mHolder.hbmController.getHdrBrightnessValue()).thenReturn(hdrBrightness);
		when(mHolder.hdrClamper.getMaxBrightness()).thenReturn(clampedBrightness);
		when(mHolder.hdrClamper.getTransitionRate()).thenReturn(transitionRate);

		mHolder.dpc.requestPowerState(dpr, /* waitForNegativeProximity= */ false);
		advanceTime(1); // Run updatePowerState

		verify(mHolder.animator, atLeastOnce()).animateTo(eq(hdrBrightness), anyFloat(),
		eq(BRIGHTNESS_RAMP_RATE_FAST_INCREASE), eq(false));
		}

		@Test
		public void testRampRateForHdrContent_HdrClamperOn() {
		float clampedBrightness = 0.6f;
		float transitionRate = 1.5f;
		when(mDisplayManagerFlagsMock.isHdrClamperEnabled()).thenReturn(true);
		mHolder = createDisplayPowerController(DISPLAY_ID, UNIQUE_ID, /* isEnabled= */ true);

		DisplayPowerRequest dpr = new DisplayPowerRequest();
		@@ -2631,6 +2607,8 @@ public final class DisplayPowerControllerTest {
		BrightnessClamperController clamperController = mock(BrightnessClamperController.class);

		when(hbmController.getCurrentBrightnessMax()).thenReturn(PowerManager.BRIGHTNESS_MAX);
		when(hdrClamper.clamp(anyFloat())).thenAnswer(
		invocation -> invocation.getArgument(0));
		when(clamperController.clamp(any(), any(), anyFloat(), anyBoolean(),
		anyInt())).thenAnswer(
		invocation -> DisplayBrightnessState.Builder.from(mDisplayBrightnessState)