commit bf8ff76fee7cbf3d2002207f3eb52eb58014c6ad
author Insun Kang <insun@google.com> Mon Mar 07 06:31:21 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 07 06:31:22 2016 +0000
tree 8000164704ece63d0e1e8f92573c65bfaa255292
parent a30918dc26876a16ee2a56d2549806f0b5291e2c
parent c9763d766c72c32683d2afc10e4eafff64690a24

Merge "Fix wrong metadata conversion in MediaSessionLegacyHelper" into nyc-dev

media/java/android/media/session/MediaSessionLegacyHelper.java

diff --git a/media/java/android/media/session/MediaSessionLegacyHelper.java b/media/java/android/media/session/MediaSessionLegacyHelper.java
index c61d7ad..95cb8ae 100644
--- a/media/java/android/media/session/MediaSessionLegacyHelper.java
+++ b/media/java/android/media/session/MediaSessionLegacyHelper.java
@@ -154,8 +154,8 @@
                     metadata.getString(MediaMetadata.METADATA_KEY_WRITER));
         }
         if (metadata.containsKey(MediaMetadata.METADATA_KEY_YEAR)) {
-            oldMetadata.putString(String.valueOf(MediaMetadataRetriever.METADATA_KEY_YEAR),
-                    metadata.getString(MediaMetadata.METADATA_KEY_YEAR));
+            oldMetadata.putLong(String.valueOf(MediaMetadataRetriever.METADATA_KEY_YEAR),
+                    metadata.getLong(MediaMetadata.METADATA_KEY_YEAR));
         }
         return oldMetadata;
     }