Merge "Fix lux-to-brightness mapping key" into main (2e27386d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/config/DisplayBrightnessMappingConfig.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -118,8 +118,13 @@ public class DisplayBrightnessMappingConfig {
		"The first lux value in the display brightness mapping must be 0");
		}

		String key = (mapping.getMode() == null ? "default" : mapping.getMode()) + "_"
		+ (mapping.getSetting() == null ? "normal" : mapping.getSetting());
		String key = (mapping.getMode() == null
		? AutoBrightnessModeName._default.getRawName()
		: mapping.getMode().getRawName())
		+ "_"
		+ (mapping.getSetting() == null
		? AutoBrightnessSettingName.normal.getRawName()
		: mapping.getSetting().getRawName());
		if (mBrightnessLevelsMap.containsKey(key)
		\|\| mBrightnessLevelsLuxMap.containsKey(key)) {
		throw new IllegalArgumentException(

+23 −0

Original line number	Diff line number	Diff line
		@@ -759,6 +759,15 @@ public final class DisplayDeviceConfigTest {
		AUTO_BRIGHTNESS_MODE_DEFAULT,
		Settings.System.SCREEN_BRIGHTNESS_AUTOMATIC_DIM), SMALL_DELTA);

		assertArrayEquals(new float[]{0.0f, 80},
		mDisplayDeviceConfig.getAutoBrightnessBrighteningLevelsLux(
		AUTO_BRIGHTNESS_MODE_DEFAULT,
		Settings.System.SCREEN_BRIGHTNESS_AUTOMATIC_BRIGHT), ZERO_DELTA);
		assertArrayEquals(new float[]{0.6f, 0.7f},
		mDisplayDeviceConfig.getAutoBrightnessBrighteningLevels(
		AUTO_BRIGHTNESS_MODE_DEFAULT,
		Settings.System.SCREEN_BRIGHTNESS_AUTOMATIC_BRIGHT), SMALL_DELTA);

		assertArrayEquals(new float[]{0.0f, 95},
		mDisplayDeviceConfig.getAutoBrightnessBrighteningLevelsLux(
		AUTO_BRIGHTNESS_MODE_DOZE,
		@@ -1197,6 +1206,20 @@ public final class DisplayDeviceConfigTest {
		+ "</map>\n"
		+ "</luxToBrightnessMapping>\n"
		+ "<luxToBrightnessMapping>\n"
		+ "<mode>default</mode>\n"
		+ "<setting>bright</setting>\n"
		+ "<map>\n"
		+ "<point>\n"
		+ "<first>0</first>\n"
		+ "<second>0.6</second>\n"
		+ "</point>\n"
		+ "<point>\n"
		+ "<first>80</first>\n"
		+ "<second>0.7</second>\n"
		+ "</point>\n"
		+ "</map>\n"
		+ "</luxToBrightnessMapping>\n"
		+ "<luxToBrightnessMapping>\n"
		+ "<mode>doze</mode>\n"
		+ "<map>\n"
		+ "<point>\n"