From 01b6dd29ffb1141748586019b22233cc3ccc84f3 Mon Sep 17 00:00:00 2001
From: Santos Cordon <santoscordon@google.com>
Date: Sat, 1 May 2021 11:10:50 +0100
Subject: [PATCH] Fix crash on device without nits-backlight mapping

When there is no nits mapping, we sent NaN for the
sdr backlight value, which is invalid. Instead, send
the same (valid) backlight value for normal and SDR
brightnesses.

Bug: 186895034
Test: Manually verify that a device without nit-backlight
      mapping can still boot normally.
Change-Id: Ie6786fa17776674d914e66727f324368831f6761
---
 .../java/com/android/server/display/LocalDisplayAdapter.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
index 754e35eff6c16..e7f056261b70f 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 @@ 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) {