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

Commit 06a0bcfc 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 

Change-Id: If830869b08e97aff016754b091cc94bb165fe915
parents f240b9d7 fa6618d4

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;