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

Stop NaN being passed to brightness curve.

Browse Source 
PowerManager.BRIGHTNESS_INVALID_FLOAT was being passed on when it shoudln't have been, if statement has been fixed to avoid this.

Bug: 152685837

Test: AutomaticBrightnessControllerTest, adb shell dumpsys display |
grep mBrightnessSpline (check no NaN values)

Change-Id: Ic2d22938ccc81cb2b9e2645b7e21acd89163b107
This commit is contained in:
Fiona Campbell
2020-04-02 12:56:15 +01:00
parent d80aee2ed8
commit 57af7c805c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/display/DisplayManagerService.java
View File

@@ -551,7 +551,8 @@ public final class DisplayManagerService extends SystemService {
}
if (state == Display.STATE_OFF) {
brightnessState = PowerManager.BRIGHTNESS_OFF_FLOAT;
} else if (brightnessState < PowerManager.BRIGHTNESS_MIN || Float.isNaN(brightnessState)) {
} else if (brightnessState != PowerManager.BRIGHTNESS_OFF_FLOAT
&& brightnessState < PowerManager.BRIGHTNESS_MIN) {
brightnessState = PowerManager.BRIGHTNESS_INVALID_FLOAT;
} else if (brightnessState > PowerManager.BRIGHTNESS_MAX) {
brightnessState = PowerManager.BRIGHTNESS_MAX;