Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 422db53f authored by Michael Wright's avatar Michael Wright Committed by Android Git Automerger
Browse files

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

* commit 'c6de3212':
  Don't try to scale the bitmaps for null MediaMetadata.
parents 8650c358 c6de3212

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

+3 −1
Original line number Diff line number Diff line
@@ -412,7 +412,9 @@ public final class MediaSession { 
     * @param metadata The new metadata

     */

    public void setMetadata(@Nullable MediaMetadata metadata) {

        if (metadata != null ) {

            metadata = (new MediaMetadata.Builder(metadata, mMaxBitmapSize)).build();

        }

        try {

            mBinder.setMetadata(metadata);

        } catch (RemoteException e) {