Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'c6de3212c2dd8638bf3150719ed331673fdcab06':
  Don't try to scale the bitmaps for null MediaMetadata.
This commit is contained in:
Michael Wright
2014-12-09 23:44:00 +00:00
committed by Android Git Automerger
parent 8650c358fb c6de3212c2
commit 422db53f8c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/session/MediaSession.java
View File

@@ -412,7 +412,9 @@ public final class MediaSession {
* @param metadata The new metadata * @param metadata The new metadata
*/ */
public void setMetadata(@Nullable MediaMetadata 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 { try {
mBinder.setMetadata(metadata); mBinder.setMetadata(metadata);
} catch (RemoteException e) { } catch (RemoteException e) {