diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-07-27 22:32:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-27 22:32:52 +0000 |
| commit | a621dc5a92ff3c5dda86bf88507c0e9379b07bb5 (patch) | |
| tree | 2d8d4aaef72981a2bc737bfdfecaf723730c100a /services | |
| parent | 0d5ac0b2080892861ee4202658fad859682aa786 (diff) | |
| parent | fa6ad346dd8964310a28418af65a323cf40fd751 (diff) | |
| download | frameworks_base-a621dc5a92ff3c5dda86bf88507c0e9379b07bb5.zip frameworks_base-a621dc5a92ff3c5dda86bf88507c0e9379b07bb5.tar.gz frameworks_base-a621dc5a92ff3c5dda86bf88507c0e9379b07bb5.tar.bz2 | |
am 3efb37d2: am 636e6b73: Minor tweak to screen dimming policy.
* commit '3efb37d23c14682b2958399ac05332e6eee2cdc2':
Minor tweak to screen dimming policy.
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/display/DisplayPowerController.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 09221a3..d0e4b33 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -566,8 +566,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call // Apply dimming by at least some minimum amount when user activity // timeout is about to expire. if (mPowerRequest.policy == DisplayPowerRequest.POLICY_DIM) { - brightness = Math.max(Math.min(brightness - SCREEN_DIM_MINIMUM_REDUCTION, - mScreenBrightnessDimConfig), mScreenBrightnessRangeMinimum); + if (brightness > mScreenBrightnessRangeMinimum) { + brightness = Math.max(Math.min(brightness - SCREEN_DIM_MINIMUM_REDUCTION, + mScreenBrightnessDimConfig), mScreenBrightnessRangeMinimum); + } if (!mAppliedDimming) { slowChange = false; } |