summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author liulvping <liulvping@xiaomi.com> 2016-10-21 04:46:50 +0000
committer android-build-merger <android-build-merger@google.com> 2016-10-21 04:46:50 +0000
commit78b29d52e09849de264891b8a8d635cf37aa9759 (patch)
treeecb43b86740edc7e899b9fd9a007471b13eaf7b8
parent0fcc717ed904fb90636c1c5f3c35f42afb7575c6 (diff)
parent0046acc2db15b6a96789eb5a0aebc81b800a4b88 (diff)
Merge "fix mistaken check of mScreenBrightnessDarkConfig" am: e6fe836938
am: 0046acc2db Change-Id: Iff046d5f35c34a425e4765a69700d09d6834b16f
-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 dfd42543c078..d2e29cd62346 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -284,7 +284,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 ("