Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e90472b4 authored by Piotr Wilczyński's avatar Piotr Wilczyński
Browse files

Fix lux-to-brightness mapping key 

We should call getRawName() so that the enum value "_default" is translated to "default" without the underscore.

Bug: 313907567
Test: adb shell dumpsys display
Test: atest DisplayDeviceConfigTest
Change-Id: Ib1353404d5d1c6cdd67ee7f3992f6f1c163a8a2f
parent 9da5e00d

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(

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

+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"