From d8574e9aa82071f85b751e1f7dccd19759ffc7a9 Mon Sep 17 00:00:00 2001 From: Danny Baumann Date: Wed, 4 Sep 2013 10:48:40 +0200 Subject: 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 --- .../internal/policy/impl/keyguard/KeyguardTransportControlView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.1