Merge "Don't try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev

2014-12-09 23:39:48 +00:00
parent 1102e712c1 f32bd3c5cd
commit c6de3212c2
1 changed files with 3 additions and 1 deletions
--- a/media/java/android/media/session/MediaSession.java
+++ b/media/java/android/media/session/MediaSession.java
@@ -412,7 +412,9 @@ public final class MediaSession {
     * @param metadata The new metadata
     */
    public void setMetadata(@Nullable MediaMetadata metadata) {
-        metadata = (new MediaMetadata.Builder(metadata, mMaxBitmapSize)).build();
+        if (metadata != null ) {
+            metadata = (new MediaMetadata.Builder(metadata, mMaxBitmapSize)).build();
+        }
        try {
            mBinder.setMetadata(metadata);
        } catch (RemoteException e) {