am 272b0a1d: Merge "Fixing issue where Recents would not work if the time is changed. (Bug 17995039)" into lmp-mr1-dev

* commit '272b0a1d6acdb7c4d244a498f3769e20c35f43d1':
  Fixing issue where Recents would not work if the time is changed. (Bug 17995039)
This commit is contained in:
Winson Chung
2014-10-24 18:39:28 +00:00
committed by Android Git Automerger

View File

@@ -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;
}