Merge "Remove unnecessary check in AutomaticBrightnessController" into main (2a8fe6ac) · Commits · e / os / android_frameworks_base

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

+0 −41

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.server.display;

		import static android.hardware.display.DisplayManagerInternal.DisplayPowerRequest.POLICY_DOZE;

		import static com.android.internal.display.BrightnessUtils.convertLinearToGamma;
		import static com.android.server.display.BrightnessMappingStrategy.INVALID_LUX;
		import static com.android.server.display.config.DisplayBrightnessMappingConfig.autoBrightnessModeToString;

		@@ -58,7 +57,6 @@ import com.android.internal.display.BrightnessSynchronizer;
		import com.android.internal.os.BackgroundThread;
		import com.android.server.EventLogTags;
		import com.android.server.display.brightness.BrightnessEvent;
		import com.android.server.display.brightness.BrightnessUtils;
		import com.android.server.display.brightness.clamper.BrightnessClamperController;
		import com.android.server.display.config.HysteresisLevels;
		import com.android.server.display.feature.DisplayManagerFlags;
		@@ -114,11 +112,6 @@ public class AutomaticBrightnessController {
		private static final int MSG_RUN_UPDATE = 6;
		private static final int MSG_INVALIDATE_PAUSED_SHORT_TERM_MODEL = 7;

		// If our traditional math determines that the brightness is too small to actually change,
		// then also check if brightness percent would change at least the amount of this value,
		// and if so, move forward with the change. In 0-100 percent scale.
		private static final float MINIMUM_BRIGHTNESS_PERCENT_CHANGE = .4f;

		// Callbacks for requesting updates to the display's power state
		private final Callbacks mCallbacks;

		@@ -1017,24 +1010,6 @@ public class AutomaticBrightnessController {
		return;
		}

		// Return early if the brightness didn't actually change.
		if (BrightnessSynchronizer.floatEquals(mScreenAutoBrightness, newScreenAutoBrightness)) {
		// Because brightness itself is in a logarithmic scale, the values at the low end
		// are so low that the difference between 0% and 2% might be within the float comparison
		// EPSILON value. To combat this, we do a secondary check on the percent change in
		// brightness.
		final float oldPercent = getBrightnessAsPercent(mScreenAutoBrightness);
		final float newPercent = getBrightnessAsPercent(newScreenAutoBrightness);
		final boolean isBrightnessPercentDifferent =
		!Float.isNaN(oldPercent) && !Float.isNaN(newPercent)
		&& (Math.abs(oldPercent - newPercent) > MINIMUM_BRIGHTNESS_PERCENT_CHANGE);

		if (!isBrightnessPercentDifferent) {
		// Brightness percent didn't change either, so lets return early here.
		return;
		}
		}

		if (mLoggingEnabled) {
		Slog.d(TAG, "updateAutoBrightness: "
		+ "mScreenAutoBrightness=" + mScreenAutoBrightness + ", "
		@@ -1065,22 +1040,6 @@ public class AutomaticBrightnessController {
		}
		}

		/**
		* @return specified brightness value as a [0-100] percent taking current
		* min/max constraints into account.
		*/
		private float getBrightnessAsPercent(float brightness) {
		if (!BrightnessUtils.isValidBrightnessValue(brightness)) {
		return PowerManager.BRIGHTNESS_INVALID_FLOAT;
		}
		return 100.0f * convertLinearToGamma(MathUtils.constrainedMap(
		mScreenBrightnessRangeMinimum,
		mScreenBrightnessRangeMaximum,
		getMinBrightness(),
		getMaxBrightness(),
		brightness));
		}

		// Clamps values with float range [0.0-1.0]
		private float clampScreenBrightness(float value) {
		return MathUtils.constrain(value, getMinBrightness(), getMaxBrightness());

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -588,12 +588,12 @@ public class AutomaticBrightnessControllerTest {

		// Now let's do the same for idle mode
		mController.switchMode(AUTO_BRIGHTNESS_MODE_IDLE, /* sendUpdate= */ true);
		// Called once when configuring in setUp(), once when configuring in the test,
		// once when switching,
		// Called once when configuring in setUp(), twice when configuring in the test,
		// once when switching, once when sending sensor event,
		// setAmbientLux() is called twice and once in updateAutoBrightness(),
		// nextAmbientLightBrighteningTransition() and nextAmbientLightDarkeningTransition() are
		// called twice each.
		verify(mBrightnessMappingStrategy, times(10)).getMode();
		verify(mBrightnessMappingStrategy, times(12)).getMode();
		// Called when switching.
		verify(mBrightnessMappingStrategy, times(1)).getShortTermModelTimeout();
		verify(mBrightnessMappingStrategy, times(1)).getUserBrightness();