| commit | 5493abd69225a4a112aa04ddda63876120d19300 | [log] [tgz] |
|---|---|---|
| author | Lucas Dupin <dupin@google.com> | Wed Oct 11 03:03:39 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 03:03:39 2017 +0000 |
| tree | b6d13255a3535e3ea541741f058a9c2deb7f543d | |
| parent | 8d3efa6722cc4f98a8aebe1b6903915ac10e2da8 [diff] | |
| parent | 43aca9cdc8fcaaafd98341aa87549630b2264367 [diff] |
Merge "Fixed problem where scrim transition would be cancelled" into oc-mr1-dev am: 43aca9cdc8 Change-Id: I3de9cb8713cd0df80aeffc21c29bcfc9a3818d92
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java index dc626fb..851b78c 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java
@@ -84,9 +84,6 @@ case DOZE_REQUEST_PULSE: pulseWhileDozing(mMachine.getPulseReason()); break; - case DOZE_PULSE_DONE: - mHost.abortPulsing(); - break; case INITIALIZED: mHost.startDozing(); break;
diff --git a/packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java b/packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java index b835909..5ec3dff 100644 --- a/packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java +++ b/packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java
@@ -23,7 +23,7 @@ */ 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 WakeLock mInner;