Merge "Fix stale data in keyguard transport control display" into klp-dev (a9412556) · Commits · e / os / android_frameworks_base

media/java/android/media/RemoteController.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -812,6 +812,7 @@ public final class RemoteController
		final OnClientUpdateListener l;
		synchronized(mInfoLock) {
		l = mOnClientUpdateListener;
		mMetadataEditor = null;
		}
		if (l != null) {
		l.onClientChange(clearing);

packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java

+11 −8

Original line number	Diff line number	Diff line
		@@ -101,10 +101,8 @@ public class KeyguardTransportControlView extends FrameLayout {
		new RemoteController.OnClientUpdateListener() {
		@Override
		public void onClientChange(boolean clearing) {
		if (clearing) {
		clearMetadata();
		}
		}

		@Override
		public void onClientPlaybackStateUpdate(int state) {
		@@ -302,6 +300,7 @@ public class KeyguardTransportControlView extends FrameLayout {
		mPopulateMetadataWhenAttached = null;
		}
		if (DEBUG) Log.v(TAG, "Registering TCV " + this);
		mMetadata.clear();
		mAudioManager.registerRemoteController(mRemoteController);
		KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mUpdateMonitor);
		}
		@@ -321,6 +320,7 @@ public class KeyguardTransportControlView extends FrameLayout {
		if (DEBUG) Log.v(TAG, "Unregistering TCV " + this);
		mAudioManager.unregisterRemoteController(mRemoteController);
		KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mUpdateMonitor);
		mMetadata.clear();
		mUserSeeking = false;
		removeCallbacks(mUpdateSeekBars);
		}
		@@ -395,10 +395,10 @@ public class KeyguardTransportControlView extends FrameLayout {
		Log.e(TAG, "Couldn't get remote control client package icon", e);
		}
		setBadgeIcon(badgeIcon);
		if (!TextUtils.isEmpty(mMetadata.trackTitle)) {
		mTrackTitle.setText(mMetadata.trackTitle);
		}
		StringBuilder sb = new StringBuilder();
		mTrackTitle.setText(!TextUtils.isEmpty(mMetadata.trackTitle)
		? mMetadata.trackTitle : null);

		final StringBuilder sb = new StringBuilder();
		if (!TextUtils.isEmpty(mMetadata.artist)) {
		if (sb.length() != 0) {
		sb.append(" - ");
		@@ -411,7 +411,10 @@ public class KeyguardTransportControlView extends FrameLayout {
		}
		sb.append(mMetadata.albumTitle);
		}
		mTrackArtistAlbum.setText(sb.toString());

		final String trackArtistAlbum = sb.toString();
		mTrackArtistAlbum.setText(!TextUtils.isEmpty(trackArtistAlbum) ?
		trackArtistAlbum : null);

		if (mMetadata.duration >= 0) {
		setSeekBarsEnabled(true);