Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rupesh Bansal
2023-01-10 18:30:40 +00:00
committed by Android (Google) Code Review
parent 299a5f2640 ddb7353bd8
commit 1076e69eff
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/display/DisplayPowerController2.java
View File

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

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

@@ -48,7 +48,6 @@ public class TemporaryBrightnessStrategy implements DisplayBrightnessStrategy {
BrightnessUtils.constructDisplayBrightnessState(BrightnessReason.REASON_TEMPORARY,
mTemporaryScreenBrightness,
mTemporaryScreenBrightness);
mTemporaryScreenBrightness = Float.NaN;
return displayBrightnessState;
}

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

@@ -59,8 +59,6 @@ public class TemporaryBrightnessStrategyTest {
DisplayBrightnessState updatedDisplayBrightnessState =
mTemporaryBrightnessStrategy.updateBrightness(displayPowerRequest);
assertEquals(updatedDisplayBrightnessState, expectedDisplayBrightnessState);
assertEquals(mTemporaryBrightnessStrategy.getTemporaryScreenBrightness(),
Float.NaN, 0.0f);
}
}