summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2013-09-04 10:48:40 +0200
committerDanny Baumann <dannybaumann@web.de>2013-09-04 10:48:40 +0200
commitd8574e9aa82071f85b751e1f7dccd19759ffc7a9 (patch)
tree54af3198abf1b4541a07e3f87d10f8beac39b90e
parentf9e4ad62d692f5b0afc1be62080012f93a73a386 (diff)
downloadframeworks_base-d8574e9aa82071f85b751e1f7dccd19759ffc7a9.zip
frameworks_base-d8574e9aa82071f85b751e1f7dccd19759ffc7a9.tar.gz
frameworks_base-d8574e9aa82071f85b751e1f7dccd19759ffc7a9.tar.bz2
Fix flicker in lockscreen if music controls are disabled.
Pretend no music is playing if music controls are disabled, as otherwise KeyguardHostView gets confused as there's a mismatch between the result of isMusicPlaying() and the onListenerAttached() / onListenerDetached() callbacks. Change-Id: Ic3bd2c6f143ce8b67c80abb408a4ff463ebae53d JIRA:CYAN-1935
-rw-r--r--policy/src/com/android/internal/policy/impl/keyguard/KeyguardTransportControlView.java2
1 files changed, 1 insertions, 1 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 b880d5f..5565fb6 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardTransportControlView.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardTransportControlView.java
@@ -382,7 +382,7 @@ public class KeyguardTransportControlView extends FrameLayout implements OnClick
}
public boolean isMusicPlaying() {
- if (!mMusicClientPresent) {
+ if (!mMusicClientPresent || !mShouldBeShown) {
return false;
}
return mCurrentPlayState == RemoteControlClient.PLAYSTATE_PLAYING