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

Commit 15aaaec2 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Allow electron beam for device with brightness animation enabled and... 

Merge "Allow electron beam for device with brightness animation enabled and disable fade (when electron beam is disabled) for device with brightness animation disabled." into gingerbread
parents 5a473298 e0880dc6

services/java/com/android/server/PowerManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -2136,7 +2136,7 @@ class PowerManagerService extends IPowerManager.Stub 
            final boolean electrifying = animating &&

                ((mElectronBeamAnimationOff && targetValue == Power.BRIGHTNESS_OFF) ||

                 (mElectronBeamAnimationOn && (int)curValue == Power.BRIGHTNESS_OFF));

            if (mAnimateScreenLights || !electrifying) {

            if (mAnimateScreenLights && !electrifying) {

                synchronized (mLocks) {

                    long now = SystemClock.uptimeMillis();

                    boolean more = mScreenBrightness.stepLocked();