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

Commit 7303db73 authored by Rupesh Bansal's avatar Rupesh Bansal
Browse files

Fix the issue where the first brightness for a device was set to 0 

Bug: 267479840
Test: Manually verified that the first brightness is set to the default
value

Change-Id: Ibc2f038d4651e8e0d05b2ab77945bdc0cd76f962
parent b4ee4ef1

services/core/java/com/android/server/display/brightness/DisplayBrightnessController.java

+1 −1
Original line number Diff line number Diff line
@@ -92,9 +92,9 @@ public final class DisplayBrightnessController { 
        // TODO: b/186428377 update brightness setting when display changes

        mBrightnessSetting = brightnessSetting;

        mPendingScreenBrightness = PowerManager.BRIGHTNESS_INVALID_FLOAT;

        mScreenBrightnessDefault = BrightnessUtils.clampAbsoluteBrightness(defaultScreenBrightness);

        mCurrentScreenBrightness = getScreenBrightnessSetting();

        mOnBrightnessChangeRunnable = onBrightnessChangeRunnable;

        mScreenBrightnessDefault = BrightnessUtils.clampAbsoluteBrightness(defaultScreenBrightness);

        mDisplayBrightnessStrategySelector = injector.getDisplayBrightnessStrategySelector(context,

                displayId);

    }

services/tests/servicestests/src/com/android/server/display/brightness/DisplayBrightnessControllerTest.java

+8 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ import org.mockito.MockitoAnnotations; 
@RunWith(AndroidJUnit4.class)

public final class DisplayBrightnessControllerTest {

    private static final int DISPLAY_ID = 1;

    private static final float DEFAULT_BRIGHTNESS = 0.4f;

    private static final float DEFAULT_BRIGHTNESS = 0.15f;



    @Mock

    private DisplayBrightnessStrategySelector mDisplayBrightnessStrategySelector;
@@ -70,10 +70,17 @@ public final class DisplayBrightnessControllerTest { 
                return mDisplayBrightnessStrategySelector;

            }

        };

        when(mBrightnessSetting.getBrightness()).thenReturn(Float.NaN);

        mDisplayBrightnessController = new DisplayBrightnessController(mContext, injector,

                DISPLAY_ID, DEFAULT_BRIGHTNESS, mBrightnessSetting, mOnBrightnessChangeRunnable);

    }



    @Test

    public void testIfFirstScreenBrightnessIsDefault() {

        assertEquals(mDisplayBrightnessController.getCurrentBrightness(), DEFAULT_BRIGHTNESS,

                0.0f);

    }



    @Test

    public void testUpdateBrightness() {

        DisplayPowerRequest displayPowerRequest = mock(DisplayPowerRequest.class);