commit c6de3212c2dd8638bf3150719ed331673fdcab06
author Michael Wright <michaelwr@google.com> Tue Dec 09 23:39:48 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 09 23:39:50 2014 +0000
tree e52c177ae462ed871056baf7b880038ae3da8236
parent 1102e712c11e7679da89a2f66288ca4fad4df85c
parent f32bd3c5cd8bd2c00f52ea32d7481c30e29d2acc

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

media/java/android/media/session/MediaSession.java

diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java
index e13f008..df4bc78 100644
--- a/media/java/android/media/session/MediaSession.java
+++ b/media/java/android/media/session/MediaSession.java
@@ -412,7 +412,9 @@
      * @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) {