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

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

Change-Id: I4b73ec7cd670e47f5308b381734b3970186be8d8
This commit is contained in:
Santos Cordon
2021-05-02 19:44:38 +00:00
committed by Automerger Merge Worker

View File

@@ -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) {