Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efe1354b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't update brightness settings when throttling brightness" into... 

Merge "Don't update brightness settings when throttling brightness" into tm-dev am: c37d317e am: 40622ad7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17976323



Change-Id: I3fd2ed0cc377a090893b0a7a576c45e9425f80e7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 500ff0ef 40622ad7

services/core/java/com/android/server/display/DisplayPowerController.java

+0 −2
Original line number Diff line number Diff line
@@ -1389,12 +1389,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                // Brightness throttling is needed, so do so quickly.

                // Later, when throttling is removed, we let other mechanisms decide on speed.

                slowChange = false;

                updateScreenBrightnessSetting = true;

            }

            mAppliedThrottling = true;

        } else if (mAppliedThrottling) {

            mAppliedThrottling = false;

            updateScreenBrightnessSetting = true;

        }



        if (updateScreenBrightnessSetting) {