Merge "Proper retrieval and storing of metadata"

1 files changed, 11 insertions, 2 deletions

diff --git a/src/com/android/bluetooth/avrcp/Avrcp.java b/src/com/android/bluetooth/avrcp/Avrcp.java
index dfa24d2f0..dab76174c 100644
--- a/src/com/android/bluetooth/avrcp/Avrcp.java
+++ b/src/com/android/bluetooth/avrcp/Avrcp.java
@@ -1431,11 +1431,16 @@ public final class Avrcp {
                 final MediaPlayerInfo di = rccIterator.next();
                 if (di.GetPlayerFocus()) {
                     if (DEBUG) Log.v(TAG, "resetting current MetaData");
-                    mMetadata = di.GetMetadata();
+                    mMetadata.artist = di.GetMetadata().artist;
+                    mMetadata.trackTitle = di.GetMetadata().trackTitle;
+                    mMetadata.albumTitle = di.GetMetadata().albumTitle;
+                    mMetadata.genre = di.GetMetadata().genre;
+                    mMetadata.tracknum = di.GetMetadata().tracknum;
                     break;
                 }
             }
         }
+
         String oldMetadata = mMetadata.toString();
         mMetadata.artist = data.getString(MediaMetadataRetriever.METADATA_KEY_ARTIST, null);
         mMetadata.trackTitle = data.getString(MediaMetadataRetriever.METADATA_KEY_TITLE, null);
@@ -1444,7 +1449,8 @@ public final class Avrcp {
         mTrackNumber = data.getLong(MediaMetadataRetriever.METADATA_KEY_NUM_TRACKS, -1L);
         mMetadata.tracknum = data.getLong(MediaMetadataRetriever.METADATA_KEY_CD_TRACK_NUMBER, -1L);
 
-        Log.v(TAG,"mMetadata.toString() = " + mMetadata.toString());
+        Log.v(TAG,"old Metadata = " + oldMetadata);
+        Log.v(TAG,"new MetaData " + mMetadata.toString());
 
         if (mMediaPlayers.size() > 0) {
             final Iterator<MediaPlayerInfo> rccIterator = mMediaPlayers.iterator();
@@ -1457,6 +1463,7 @@ public final class Avrcp {
                 }
             }
         }
+
         if (!oldMetadata.equals(mMetadata.toString())) {
             updateTrackNumber();
             Log.v(TAG,"new mMetadata, mTrackNumber update to " + mTrackNumber);
@@ -3969,6 +3976,8 @@ private void updateLocalPlayerSettings( byte[] data) {
             mMetadata.albumTitle = metaData.albumTitle;
             mMetadata.artist = metaData.artist;
             mMetadata.trackTitle = metaData.trackTitle;
+            mMetadata.genre = metaData.genre;
+            mMetadata.tracknum = metaData.tracknum;
         }
         public byte GetPlayState() {
             return mPlayState;