diff options
| author | Winson Chung <winsonc@google.com> | 2014-10-24 18:32:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-24 18:32:02 +0000 |
| commit | 272b0a1d6acdb7c4d244a498f3769e20c35f43d1 (patch) | |
| tree | 43f51fcb10b61546de1a09ddd215e6c3bc313c67 | |
| parent | 623484d231436ee209089adaa6b88b68f0ebf534 (diff) | |
| parent | 9a22a175f6c73d448e5d2223d6ae16aa59b99b28 (diff) | |
| download | frameworks_base-272b0a1d6acdb7c4d244a498f3769e20c35f43d1.zip frameworks_base-272b0a1d6acdb7c4d244a498f3769e20c35f43d1.tar.gz frameworks_base-272b0a1d6acdb7c4d244a498f3769e20c35f43d1.tar.bz2 | |
Merge "Fixing issue where Recents would not work if the time is changed. (Bug 17995039)" into lmp-mr1-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java b/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java index d66add5..97c3ad9 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java +++ b/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java @@ -323,7 +323,8 @@ public class AlternateRecentsComponent { // If the user has toggled it too quickly, then just eat up the event here (it's better than // showing a janky screenshot). // NOTE: Ideally, the screenshot mechanism would take the window transform into account - if (System.currentTimeMillis() - mLastToggleTime < sMinToggleDelay) { + long currentTime = System.currentTimeMillis(); + if ((currentTime > mLastToggleTime) && (currentTime - mLastToggleTime) < sMinToggleDelay) { return; } |