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

Merge "Stop NaN being passed to brightness curve." into rvc-dev

Browse Source
This commit is contained in:
Fiona Campbell
2020-04-16 10:41:14 +00:00
committed by Android (Google) Code Review
parent 4cc1d1a858 57af7c805c
commit fa6618d462
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

@@ -552,7 +552,8 @@ public final class DisplayManagerService extends SystemService {
} }
if (state == Display.STATE_OFF) { if (state == Display.STATE_OFF) {
brightnessState = PowerManager.BRIGHTNESS_OFF_FLOAT; 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; brightnessState = PowerManager.BRIGHTNESS_INVALID_FLOAT;
} else if (brightnessState > PowerManager.BRIGHTNESS_MAX) { } else if (brightnessState > PowerManager.BRIGHTNESS_MAX) {
brightnessState = PowerManager.BRIGHTNESS_MAX; brightnessState = PowerManager.BRIGHTNESS_MAX;