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

Commit 0931b98e authored by Fiona Campbell's avatar Fiona Campbell
Browse files

Only load even dimmer if enabled in config 

- Ensure even dimmer data is only loaded if enabled globally on the
  device.

Bug: 179428400
Test: logcat | grep LocalDisplayAdapter
Change-Id: I7d10fcc22f451b86f84f75a19d46bd1e08a00787
parent 71c577bf

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

+2 −1
Original line number Diff line number Diff line
@@ -1766,7 +1766,8 @@ public class DisplayDeviceConfig { 
                loadDensityMapping(config);

                loadBrightnessDefaultFromDdcXml(config);

                loadBrightnessConstraintsFromConfigXml();

                if (mFlags.isEvenDimmerEnabled()) {

                if (mFlags.isEvenDimmerEnabled() && mContext.getResources().getBoolean(

                        com.android.internal.R.bool.config_evenDimmerEnabled)) {

                    mEvenDimmerBrightnessData = EvenDimmerBrightnessData.loadConfig(config);

                }

                loadBrightnessMap(config);

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

+1 −0
Original line number Diff line number Diff line
@@ -920,6 +920,7 @@ public final class DisplayDeviceConfigTest { 
    @Test

    public void testEvenDimmer() throws IOException {

        when(mFlags.isEvenDimmerEnabled()).thenReturn(true);

        when(mResources.getBoolean(R.bool.config_evenDimmerEnabled)).thenReturn(true);

        setupDisplayDeviceConfigFromDisplayConfigFile(getContent(getValidLuxThrottling(),

                getValidProxSensor(), /* includeIdleMode= */ false, /* enableEvenDimmer */ true));