summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Rupesh Bansal <brup@google.com> 2022-09-30 12:50:21 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-09-30 12:50:21 +0000
commit5ccd5ecd3c910f742ee25b59cefafa1873685b6e (patch)
tree2f243e97b29cd724630137ea3ce431389c5cdd5f
parentb199448e6c5b8709848a13563a707dee91b249cf (diff)
parente1e1b1283c64d504c7ec7c44955d0cf5fc151281 (diff)
Merge "Bringing DPC and DPC2 in sync"
-rw-r--r--services/core/java/com/android/server/display/DisplayPowerController2.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/display/DisplayPowerController2.java b/services/core/java/com/android/server/display/DisplayPowerController2.java
index ab9bf0e0d1d4..7208c1edd55a 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController2.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController2.java
@@ -989,8 +989,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal
R.array.config_screenBrighteningThresholds);
int[] screenDarkeningThresholds = resources.getIntArray(
R.array.config_screenDarkeningThresholds);
- int[] screenThresholdLevels = resources.getIntArray(
- R.array.config_screenThresholdLevels);
+ float[] screenThresholdLevels = BrightnessMappingStrategy.getFloatArray(resources
+ .obtainTypedArray(com.android.internal.R.array.config_screenThresholdLevels));
float screenDarkeningMinThreshold =
mDisplayDeviceConfig.getScreenDarkeningMinThreshold();
float screenBrighteningMinThreshold =