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

Commit 517c7ab3 authored by Santos Cordon's avatar Santos Cordon Committed by Automerger Merge Worker
Browse files

Merge "Fix crash on device without nits-backlight mapping" into sc-dev am:... 

Merge "Fix crash on device without nits-backlight mapping" into sc-dev am: 3ed02ffe am: 0d1bf034

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14392204

Change-Id: I3716476dabe45685408c3ad0e46b37ce503ed78d
parents 946ef7e2 0d1bf034

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

+1 −1
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ final class LocalDisplayAdapter extends DisplayAdapter { 
                        try {

                            final float backlight = brightnessToBacklight(brightness);

                            float nits = NITS_INVALID;

                            float sdrBacklight = PowerManager.BRIGHTNESS_INVALID_FLOAT;

                            float sdrBacklight = backlight;

                            float sdrNits = NITS_INVALID;

                            if (getDisplayDeviceConfig().hasNitsMapping()

                                    && sdrBrightness != PowerManager.BRIGHTNESS_INVALID_FLOAT) {