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

Commit df50c12a authored by Adrian Roos's avatar Adrian Roos Committed by Android Git Automerger
Browse files

am 6abed070: am 359f5944: am 06a86644: Merge "Fix wakelock leak for dozing" into mnc-dr-dev 

* commit '6abed070':
  Fix wakelock leak for dozing
parents 84551d61 6abed070

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

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




    private void continuePulsing(int reason) {

    private void continuePulsing(int reason) {

        if (mHost.isPulsingBlocked()) {

        if (mHost.isPulsingBlocked()) {

            mPulsing = false;

            mWakeLock.release();

            return;

            return;

        }

        }

        mHost.pulseWhileDozing(new DozeHost.PulseCallback() {

        mHost.pulseWhileDozing(new DozeHost.PulseCallback() {

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

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

     * Aborts pulsing immediately.

     */

     */

    public void abortPulsing() {

    public void abortPulsing() {

        mHandler.removeCallbacks(mPulseIn);

        cancelPulsing();

        abortAnimations();

        if (mDozing) {

        if (mDozing) {

            mScrimController.setDozeBehindAlpha(1f);

            mScrimController.setDozeBehindAlpha(1f);

            mScrimController.setDozeInFrontAlpha(1f);

            mScrimController.setDozeInFrontAlpha(1f);

        }

        }

        mPulseCallback = null;

    }

    }





    public void onScreenTurnedOn() {

    public void onScreenTurnedOn() {