From 1693f6a5639a1f993bdc1dca9dade5e3eb3c14f2 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Sun, 20 Oct 2013 17:21:57 -0700 Subject: [PATCH] Prevent having multiple seek runnables in flight. This fix ensures that only one runnable is running at a time, no matter how many events come in. There's probably a better way to do this, but this is a safe fix. Fixes bug 11307391 Change-Id: I007c95062b20285571f39603c95fb9174b9a2da3 --- .../android/keyguard/KeyguardTransportControlView.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java index 464201ca06e08..2e35439f7a030 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java @@ -134,6 +134,7 @@ public class KeyguardTransportControlView extends FrameLayout { private final Runnable mUpdateSeekBars = new Runnable() { public void run() { if (updateSeekBars()) { + removeCallbacks(this); postDelayed(this, 1000); } } @@ -249,7 +250,6 @@ public class KeyguardTransportControlView extends FrameLayout { } if (enabled) { mUpdateSeekBars.run(); - postDelayed(mUpdateSeekBars, 1000); } else { removeCallbacks(mUpdateSeekBars); } @@ -437,8 +437,7 @@ public class KeyguardTransportControlView extends FrameLayout { setSeekBarsEnabled(false); } - KeyguardUpdateMonitor.getInstance(getContext()).dispatchSetBackground( - mMetadata.bitmap); + KeyguardUpdateMonitor.getInstance(getContext()).dispatchSetBackground(mMetadata.bitmap); final int flags = mTransportControlFlags; setVisibilityBasedOnFlag(mBtnPrev, flags, RemoteControlClient.FLAG_KEY_MEDIA_PREVIOUS); setVisibilityBasedOnFlag(mBtnNext, flags, RemoteControlClient.FLAG_KEY_MEDIA_NEXT); @@ -539,7 +538,7 @@ public class KeyguardTransportControlView extends FrameLayout { imageResId = R.drawable.ic_media_pause; imageDescId = R.string.keyguard_transport_pause_description; if (mSeekEnabled) { - postDelayed(mUpdateSeekBars, 1000); + mUpdateSeekBars.run(); } break; @@ -567,6 +566,7 @@ public class KeyguardTransportControlView extends FrameLayout { boolean updateSeekBars() { final int position = (int) mRemoteController.getEstimatedMediaPosition(); if (position >= 0) { + if (DEBUG) Log.v(TAG, "Seek to " + position); if (!mUserSeeking) { mTransientSeekBar.setProgress(position); }