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

Commit 6d259cb4 authored by Fiona Campbell's avatar Fiona Campbell Committed by Automerger Merge Worker
Browse files

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

Merge "Stop NaN being passed to brightness curve." into rvc-dev am: fa6618d4 am: 04cac896 am: 2fdba20c

Change-Id: I675c305b0999d20eff965c5da33cda52ac4818f9
parents 84751c62 2fdba20c

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

+2 −1
Original line number Diff line number Diff line
@@ -552,7 +552,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;