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

Commit 1076e69e authored by Rupesh Bansal's avatar Rupesh Bansal Committed by Android (Google) Code Review
Browse files

Merge "Allowing autobrightness to be enabled in the temporary brightness state"

parents 299a5f26 ddb7353b

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

+3 −1
Original line number Diff line number Diff line
@@ -1197,7 +1197,9 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                        && Display.isDozeState(state);

        final boolean autoBrightnessEnabled = mUseAutoBrightness

                && (state == Display.STATE_ON || autoBrightnessEnabledInDoze)

                && Float.isNaN(brightnessState)

                && (Float.isNaN(brightnessState)

                        || mBrightnessReasonTemp.getReason() == BrightnessReason.REASON_TEMPORARY

                        || mBrightnessReasonTemp.getReason() == BrightnessReason.REASON_BOOST)

                && mAutomaticBrightnessController != null;

        final boolean autoBrightnessDisabledDueToDisplayOff = mUseAutoBrightness

                && !(state == Display.STATE_ON || autoBrightnessEnabledInDoze);

services/core/java/com/android/server/display/brightness/strategy/TemporaryBrightnessStrategy.java

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ public class TemporaryBrightnessStrategy implements DisplayBrightnessStrategy { 
                BrightnessUtils.constructDisplayBrightnessState(BrightnessReason.REASON_TEMPORARY,

                        mTemporaryScreenBrightness,

                        mTemporaryScreenBrightness);

        mTemporaryScreenBrightness = Float.NaN;

        return displayBrightnessState;

    }

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

+0 −2
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ public class TemporaryBrightnessStrategyTest { 
        DisplayBrightnessState updatedDisplayBrightnessState =

                mTemporaryBrightnessStrategy.updateBrightness(displayPowerRequest);

        assertEquals(updatedDisplayBrightnessState, expectedDisplayBrightnessState);

        assertEquals(mTemporaryBrightnessStrategy.getTemporaryScreenBrightness(),

                Float.NaN, 0.0f);

    }



}