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

Commit ddb7353b authored by Rupesh Bansal's avatar Rupesh Bansal
Browse files

Allowing autobrightness to be enabled in the temporary brightness 

state

This fixes the issue where the brightness wouldnt change when the slider
is moved when autobrightness is enabled.

Bug: 262355667
Test: Manually move the slider with autobrightness enabled, and confirm
that the brightness changes and do not return back to the initial point.

Change-Id: Ic21b6c42c446ec4fca0e4cc203ef5e9c5211ffcd
parent bb9a1f6c

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

+3 −1
Original line number Diff line number Diff line
@@ -1192,7 +1192,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);

    }



}