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

Commit d248c681 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't reset brightness when going into AOD_PAUSED" into tm-dev

parents cb723361 72bdcf6e

packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java

+3 −1
Original line number Diff line number Diff line
@@ -147,10 +147,12 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi 
                setLightSensorEnabled(true);

                break;

            case DOZE:

            case DOZE_AOD_PAUSED:

                setLightSensorEnabled(false);

                resetBrightnessToDefault();

                break;

            case DOZE_AOD_PAUSED:

                setLightSensorEnabled(false);

                break;

            case FINISH:

                onDestroy();

                break;

packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenBrightnessTest.java

+1 −4
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ public class DozeScreenBrightnessTest extends SysuiTestCase { 
    }



    @Test

    public void transitionToAodPaused_resetsToDefaultBrightness_lightSensorDisabled() {

    public void transitionToAodPaused_lightSensorDisabled() {

        // GIVEN AOD

        mScreen.transitionTo(UNINITIALIZED, INITIALIZED);

        mScreen.transitionTo(INITIALIZED, DOZE_AOD);
@@ -516,9 +516,6 @@ public class DozeScreenBrightnessTest extends SysuiTestCase { 
        mScreen.transitionTo(DOZE_AOD, DOZE_AOD_PAUSED);

        waitForSensorManager();



        // THEN brightness is reset and light sensor is unregistered

        assertEquals(mServiceFake.screenBrightness, DEFAULT_BRIGHTNESS);



        // THEN new light events don't update brightness since the light sensor was unregistered

        mSensor.sendSensorEvent(1);

        assertEquals(mServiceFake.screenBrightness, DEFAULT_BRIGHTNESS);