diff options
| author | 2017-10-11 02:55:29 +0000 | |
|---|---|---|
| committer | 2017-10-11 02:55:29 +0000 | |
| commit | 43aca9cdc8fcaaafd98341aa87549630b2264367 (patch) | |
| tree | 10e9389929446c9a5f000ae02e56126d32af08d7 | |
| parent | ab10e1a7dbfac81d30c8277557d6c4f18668d89e (diff) | |
| parent | 5909d0134d7eaf16fd4e7c9c01f60d0d4980f499 (diff) | |
Merge "Fixed problem where scrim transition would be cancelled" into oc-mr1-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/doze/DozeUi.java | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java index dc626fb4df65..851b78cfcd49 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 @@ public class DozeUi implements DozeMachine.Part { 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 b83590979ef7..5ec3dff0043c 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 @@ import android.os.Handler; */ 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; |