Merge "Fix DisplayDeviceConfig crash for values > 255" into sc-qpr1-dev am: 77785b6a72 am: 1f383e614f am: d66693fd07

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

Change-Id: I15a8b4ce11db3e990c1cb35e06df16c6c0c47e22
This commit is contained in:
Fiona Campbell
2021-08-27 12:11:12 +00:00
committed by Automerger Merge Worker

View File

@@ -590,7 +590,7 @@ public class DisplayDeviceConfig {
newIndex = i - newStart;
final float newBacklightVal;
final float newNitsVal;
isLastValue = mRawBacklight[i] > mBacklightMaximum
isLastValue = mRawBacklight[i] >= mBacklightMaximum
|| i >= mRawBacklight.length - 1;
// Clamp beginning and end to valid backlight values.
if (newIndex == 0) {