diff options
| author | 2016-10-21 04:58:43 +0000 | |
|---|---|---|
| committer | 2016-10-21 04:58:43 +0000 | |
| commit | 9610c3a2a9937699c2ed27e292754b531f6e05ca (patch) | |
| tree | 9efef7f34199638da669ed04a4901434cc0218e7 | |
| parent | 0c90d778caf00bdd7202af0fd7fbcfe9d59ed796 (diff) | |
| parent | 78b29d52e09849de264891b8a8d635cf37aa9759 (diff) | |
Merge "fix mistaken check of mScreenBrightnessDarkConfig" am: e6fe836938 am: 0046acc2db
am: 78b29d52e0
Change-Id: Ic780ee41444f3b335339d5bfe418ce2738785ea7
| -rw-r--r-- | services/core/java/com/android/server/display/DisplayPowerController.java | 2 |
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 df5def9ad9b9..3b2dc344d390 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 (" |