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

Commit 762c5f87 authored by Fiona Campbell's avatar Fiona Campbell Committed by Android (Google) Code Review
Browse files

Merge "Only load even dimmer if enabled in config" into main

parents 2b7db05a 0931b98e

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));