summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid van Tonder <david.vantonder@gmail.com>2013-07-12 14:42:30 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-07-12 14:42:30 -0700
commitd9eefe37ce5adc43043d929b8e03d4193a11949e (patch)
tree6516ad1492063b34d608a02818b8f0843a949a82
parent605a6beb9a6d76bef1acfcea20b41a4aee4cc0a6 (diff)
parent780caff380fad5da59c72f8706932a8ae72520f3 (diff)
downloadframeworks_base-d9eefe37ce5adc43043d929b8e03d4193a11949e.zip
frameworks_base-d9eefe37ce5adc43043d929b8e03d4193a11949e.tar.gz
frameworks_base-d9eefe37ce5adc43043d929b8e03d4193a11949e.tar.bz2
Merge "Fix occasionally flickering music control widget." into cm-10.1
-rw-r--r--policy/src/com/android/internal/policy/impl/keyguard/KeyguardTransportControlView.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardTransportControlView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardTransportControlView.java
index 20be303..b880d5f 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardTransportControlView.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardTransportControlView.java
@@ -382,8 +382,11 @@ public class KeyguardTransportControlView extends FrameLayout implements OnClick
}
public boolean isMusicPlaying() {
- return mCurrentPlayState == RemoteControlClient.PLAYSTATE_PLAYING
- || mCurrentPlayState == RemoteControlClient.PLAYSTATE_BUFFERING;
+ if (!mMusicClientPresent) {
+ return false;
+ }
+ return mCurrentPlayState == RemoteControlClient.PLAYSTATE_PLAYING
+ || mCurrentPlayState == RemoteControlClient.PLAYSTATE_BUFFERING;
}
private static void setVisibilityBasedOnFlag(View view, int flags, int flag) {