Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"" into cw-f-dev

Browse Source
This commit is contained in:
Julius D'souza
2016-10-22 03:57:59 +00:00
committed by Android (Google) Code Review
parent e28705ac90 4fff94f1ed
commit e88cbbf40d
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/display/DisplayPowerController.java
View File

@@ -686,10 +686,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
} }
// Apply dimming by at least some minimum amount when user activity // Apply dimming by at least some minimum amount when user activity
// timeout is about to expire unless we're having an ALS-based doze brightness // timeout is about to expire.
// in which case the brightness could increase, causing unwanted flashes. if (mPowerRequest.policy == DisplayPowerRequest.POLICY_DIM) {
if (mPowerRequest.policy == DisplayPowerRequest.POLICY_DIM
&& !mAllowAutoBrightnessWhileDozingConfig) {
if (brightness > mScreenBrightnessRangeMinimum) { if (brightness > mScreenBrightnessRangeMinimum) {
brightness = Math.max(Math.min(brightness - SCREEN_DIM_MINIMUM_REDUCTION, brightness = Math.max(Math.min(brightness - SCREEN_DIM_MINIMUM_REDUCTION,
mScreenBrightnessDimConfig), mScreenBrightnessRangeMinimum); mScreenBrightnessDimConfig), mScreenBrightnessRangeMinimum);