From 357286666194cc35002d1332cb603a3d1d18dfc2 Mon Sep 17 00:00:00 2001 From: Fiona Campbell Date: Wed, 25 Aug 2021 16:39:17 +0000 Subject: [PATCH] Fix DisplayDeviceConfig crash for values > 255 If screenBrightnessBacklight values in a config.xml file go above 255, they leave a string of 1.0 values for every one that is above that. This change ensures that this does not happen, and clamps the array so that it contains a maximum of 1 value of 1.0. Bug: 197491062 Test: manual - change config.xml config_screenBrightnessBacklight to go above 255 Change-Id: Id245ea902f265aa86a2caeff9d24a67fad4c37f7 --- .../java/com/android/server/display/DisplayDeviceConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java index 4c9d0f2691b37..2ae5cbbbf24ba 100644 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java @@ -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) {