summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2016-10-21 03:50:15 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-10-21 03:50:16 +0000
commite6fe836938324f8a9a98958f2ffe501ec724c91b (patch)
treee97a754cd7e4c5888581bfc1215fd2d4c5fd1600
parent37521b9ba5c3c925f2e2a274d46f6180ac4c9003 (diff)
parentd01db540a788db8fcdf80d7b97dd4d866f00100f (diff)
Merge "fix mistaken check of mScreenBrightnessDarkConfig"
-rw-r--r--services/core/java/com/android/server/display/DisplayPowerController.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index 8f8afd5615f3..3b514bee6bf9 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -286,7 +286,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+ mScreenBrightnessDarkConfig + ") to be less than or equal to "
+ "config_screenBrightnessDim (" + mScreenBrightnessDimConfig + ").");
}
- if (mScreenBrightnessDarkConfig > mScreenBrightnessDimConfig) {
+ if (mScreenBrightnessDarkConfig > screenBrightnessSettingMinimum) {
Slog.w(TAG, "Expected config_screenBrightnessDark ("
+ mScreenBrightnessDarkConfig + ") to be less than or equal to "
+ "config_screenBrightnessSettingMinimum ("