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

Commit e8edee6f authored by Michael Wright's avatar Michael Wright Committed by android-build-merger
Browse files

Merge "Initialize mPendingAutoBrightnessAdjustment to NaN." into pi-dev am: a424c79c 

am: d1f12619

Change-Id: I80130d84fd4db1b3e9814f95eb1eb992704e9407
parents dd0ff99a d1f12619

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

+2 −0
Original line number Diff line number Diff line
@@ -489,6 +489,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        mTemporaryScreenBrightness = -1;

        mPendingScreenBrightnessSetting = -1;

        mTemporaryAutoBrightnessAdjustment = Float.NaN;

        mPendingAutoBrightnessAdjustment = Float.NaN;

    }



    /**
@@ -1499,6 +1500,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
            return false;

        }

        if (mAutoBrightnessAdjustment == mPendingAutoBrightnessAdjustment) {

            mPendingAutoBrightnessAdjustment = Float.NaN;

            return false;

        }

        mAutoBrightnessAdjustment = mPendingAutoBrightnessAdjustment;