diff options
| author | 2014-12-09 13:16:26 -0800 | |
|---|---|---|
| committer | 2014-12-09 13:23:44 -0800 | |
| commit | f32bd3c5cd8bd2c00f52ea32d7481c30e29d2acc (patch) | |
| tree | cfda59b177c7215b1ff17c1970fa5530e8a981a8 | |
| parent | 14c436897ca56800a3758008f0631c559a898967 (diff) | |
Don't try to scale the bitmaps for null MediaMetadata.
Bug: 18586572
Change-Id: I133e58eeb05136ca82cbd35840b68ebedd9ec365
| -rw-r--r-- | media/java/android/media/session/MediaSession.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java index e13f0082a659..df4bc7898b7d 100644 --- 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) { |