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

Commit d9f19a87 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Fixed problem where scrim transition would be cancelled" into oc-mr1-dev am: 43aca9cd 

am: 5493abd6

Change-Id: I2f3c3a46a30eeb2287d276ca68a53d555a4f2669
parents 2d729d55 5493abd6

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -84,9 +84,6 @@ public class DozeUi implements DozeMachine.Part { 
            case DOZE_REQUEST_PULSE:

            case DOZE_REQUEST_PULSE:

                pulseWhileDozing(mMachine.getPulseReason());

                pulseWhileDozing(mMachine.getPulseReason());

                break;

                break;

            case DOZE_PULSE_DONE:

                mHost.abortPulsing();

                break;

            case INITIALIZED:

            case INITIALIZED:

                mHost.startDozing();

                mHost.startDozing();

                break;

                break;

packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ import android.os.Handler; 
 */

 */

public class DelayedWakeLock implements WakeLock {

public class DelayedWakeLock implements WakeLock {





    private static final long RELEASE_DELAY_MS = 100;

    private static final long RELEASE_DELAY_MS = 120;





    private final Handler mHandler;

    private final Handler mHandler;

    private final WakeLock mInner;

    private final WakeLock mInner;