commit 3ed02ffeb1663f92e4d727a912ce4456ba7cdaaf
author Santos Cordon <santoscordon@google.com> Sun May 02 19:29:05 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun May 02 19:29:05 2021 +0000
tree 0c09dd762c4495faf4ab90b65606af033000fe34
parent abc738e1c08c9e055c88160a8962794445cd4c7b
parent 01b6dd29ffb1141748586019b22233cc3ccc84f3

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

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

diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
index 754e35e..e7f05626 100644
--- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
@@ -790,7 +790,7 @@
                         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) {