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

Commit cd9483ab authored by Piotr Wilczyński's avatar Piotr Wilczyński Committed by Automerger Merge Worker
Browse files

Merge "Don't treat user switch as a brightness slider interaction" into... 

Merge "Don't treat user switch as a brightness slider interaction" into tm-qpr-dev am: 25db0bee am: 0e9395b4

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



Change-Id: I5f8841edd8fa973904457b964f29514252581df6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4e7af3e9 0e9395b4

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

+3 −4
Original line number Diff line number Diff line
@@ -1328,9 +1328,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        }



        final boolean autoBrightnessAdjustmentChanged = updateAutoBrightnessAdjustment();

        if (autoBrightnessAdjustmentChanged) {

            mTemporaryAutoBrightnessAdjustment = Float.NaN;

        }



        // Use the autobrightness adjustment override if set.

        final float autoBrightnessAdjustment;
@@ -2309,14 +2306,15 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 


    private void handleSettingsChange(boolean userSwitch) {

        mPendingScreenBrightnessSetting = getScreenBrightnessSetting();

        mPendingAutoBrightnessAdjustment = getAutoBrightnessAdjustmentSetting();

        if (userSwitch) {

            // Don't treat user switches as user initiated change.

            setCurrentScreenBrightness(mPendingScreenBrightnessSetting);

            updateAutoBrightnessAdjustment();

            if (mAutomaticBrightnessController != null) {

                mAutomaticBrightnessController.resetShortTermModel();

            }

        }

        mPendingAutoBrightnessAdjustment = getAutoBrightnessAdjustmentSetting();

        // We don't bother with a pending variable for VR screen brightness since we just

        // immediately adapt to it.

        mScreenBrightnessForVr = getScreenBrightnessForVrSetting();
@@ -2385,6 +2383,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        }

        mAutoBrightnessAdjustment = mPendingAutoBrightnessAdjustment;

        mPendingAutoBrightnessAdjustment = Float.NaN;

        mTemporaryAutoBrightnessAdjustment = Float.NaN;

        return true;

    }