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

Commit 7010d230 authored by Prashant Malani's avatar Prashant Malani Committed by Android Git Automerger
Browse files

am 673d8659: am 4d269ba3: am fb26a2c8: Merge "Don\'t animate screen brightness... 

am 673d8659: am 4d269ba3: am fb26a2c8: Merge "Don\'t animate screen brightness if there is a pending off transition" into lmp-sprout-dev automerge: 9d2a4785

* commit '673d8659':
  Don't animate screen brightness if there is a pending off transition
parents dfd827e4 673d8659

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

+7 −5
Original line number Diff line number Diff line
@@ -669,12 +669,14 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 


        // Animate the screen brightness when the screen is on or dozing.

        // Skip the animation when the screen is off or suspended.

        if (!mPendingScreenOff) {

            if (state == Display.STATE_ON || state == Display.STATE_DOZE) {

                animateScreenBrightness(brightness,

                        slowChange ? BRIGHTNESS_RAMP_RATE_SLOW : BRIGHTNESS_RAMP_RATE_FAST);

            } else {

                animateScreenBrightness(brightness, 0);

            }

        }



        // Determine whether the display is ready for use in the newly requested state.

        // Note that we do not wait for the brightness ramp animation to complete before