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

Commit 06a86644 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Fix wakelock leak for dozing" into mnc-dr-dev

parents c3aa7f3a 5fb4b98b

packages/SystemUI/src/com/android/systemui/doze/DozeService.java

+2 −0
Original line number Diff line number Diff line
@@ -256,6 +256,8 @@ public class DozeService extends DreamService { 


    private void continuePulsing(int reason) {

        if (mHost.isPulsingBlocked()) {

            mPulsing = false;

            mWakeLock.release();

            return;

        }

        mHost.pulseWhileDozing(new DozeHost.PulseCallback() {

packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java

+1 −3
Original line number Diff line number Diff line
@@ -104,13 +104,11 @@ public class DozeScrimController { 
     * Aborts pulsing immediately.

     */

    public void abortPulsing() {

        mHandler.removeCallbacks(mPulseIn);

        abortAnimations();

        cancelPulsing();

        if (mDozing) {

            mScrimController.setDozeBehindAlpha(1f);

            mScrimController.setDozeInFrontAlpha(1f);

        }

        mPulseCallback = null;

    }



    public void onScreenTurnedOn() {