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

Commit 9a211284 authored by Dan Gittik's avatar Dan Gittik Committed by android-build-merger
Browse files

Merge "Fixed temporary brightness getting stuck bug." into pi-dev 

am: 8a5f2379

Change-Id: I8c80cd6f14dc36eb37b27cbe51598412e59ad34f
parents 5573d089 8a5f2379

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

+2 −3
Original line number Diff line number Diff line
@@ -803,9 +803,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                    && mAutomaticBrightnessController != null;



        final boolean userSetBrightnessChanged = updateUserSetScreenBrightness();

        if (userSetBrightnessChanged) {

            mTemporaryScreenBrightness = -1;

        }



        // Use the temporary screen brightness if there isn't an override, either from

        // WindowManager or based on the display state.
@@ -1526,11 +1523,13 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        }

        if (mCurrentScreenBrightnessSetting == mPendingScreenBrightnessSetting) {

            mPendingScreenBrightnessSetting = -1;

            mTemporaryScreenBrightness = -1;

            return false;

        }

        mCurrentScreenBrightnessSetting = mPendingScreenBrightnessSetting;

        mLastUserSetScreenBrightness = mPendingScreenBrightnessSetting;

        mPendingScreenBrightnessSetting = -1;

        mTemporaryScreenBrightness = -1;

        return true;

    }