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

Commit 055adfa4 authored by Sal Savage's avatar Sal Savage Committed by Android (Google) Code Review
Browse files

Merge changes from topic "bt-cover-art-memory" into sc-dev 

* changes:
  Reduce upper limit of stored bitmaps to 32
  Make URI based image support optional and off by default
parents 851c5192 7953e971

android/app/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -105,6 +105,9 @@ 
    <!-- For enabling the AVRCP Target Cover Artowrk feature-->

    <bool name="avrcp_target_enable_cover_art">true</bool>



    <!-- Enable support for URI based images. Off by default due to increased memory usage -->

    <bool name="avrcp_target_cover_art_uri_images">false</bool>



    <!-- Package that is responsible for user interaction on pairing request,

         success or cancel.

         Receives:

android/app/src/com/android/bluetooth/audio_util/helpers/Metadata.java

+6 −3
Original line number Diff line number Diff line
@@ -130,7 +130,8 @@ public class Metadata implements Cloneable { 
            if (data.containsKey(MediaMetadata.METADATA_KEY_DURATION)) {

                mMetadata.duration = "" + data.getLong(MediaMetadata.METADATA_KEY_DURATION);

            }

            if ((mContext != null && (data.containsKey(MediaMetadata.METADATA_KEY_ART_URI)

            if ((mContext != null && Util.areUriImagesSupported(mContext)

                    && (data.containsKey(MediaMetadata.METADATA_KEY_ART_URI)

                    || data.containsKey(MediaMetadata.METADATA_KEY_ALBUM_ART_URI)

                    || data.containsKey(MediaMetadata.METADATA_KEY_DISPLAY_ICON_URI)))

                    || data.containsKey(MediaMetadata.METADATA_KEY_ART)
@@ -163,7 +164,8 @@ public class Metadata implements Cloneable { 
            // Check for artwork

            if (desc.getIconBitmap() != null) {

                mMetadata.image = new Image(mContext, desc.getIconBitmap());

            } else if (mContext != null && desc.getIconUri() != null) {

            } else if (mContext != null && Util.areUriImagesSupported(mContext)

                    && desc.getIconUri() != null) {

                mMetadata.image = new Image(mContext, desc.getIconUri());

            }
@@ -209,7 +211,8 @@ public class Metadata implements Cloneable { 
            if (bundle.containsKey(MediaMetadata.METADATA_KEY_DURATION)) {

                mMetadata.duration = "" + bundle.getLong(MediaMetadata.METADATA_KEY_DURATION);

            }

            if ((mContext != null && (bundle.containsKey(MediaMetadata.METADATA_KEY_ART_URI)

            if ((mContext != null && Util.areUriImagesSupported(mContext)

                    && (bundle.containsKey(MediaMetadata.METADATA_KEY_ART_URI)

                    || bundle.containsKey(MediaMetadata.METADATA_KEY_ALBUM_ART_URI)

                    || bundle.containsKey(MediaMetadata.METADATA_KEY_DISPLAY_ICON_URI)))

                    || bundle.containsKey(MediaMetadata.METADATA_KEY_ART)

android/app/src/com/android/bluetooth/audio_util/helpers/Util.java

+12 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ import android.media.session.MediaSession; 
import android.os.Bundle;

import android.util.Log;



import com.android.bluetooth.R;



import java.util.ArrayList;

import java.util.List;
@@ -54,6 +56,16 @@ class Util { 
        return ret;

    }



    /**

     * Get whether or not Bluetooth is configured to support URI images or not.

     *

     * Note that creating URI images will dramatically increase memory usage.

     */

    public static boolean areUriImagesSupported(Context context) {

        if (context == null) return false;

        return context.getResources().getBoolean(R.bool.avrcp_target_cover_art_uri_images);

    }



    /**

     * Translate a bundle of MediaMetadata keys to audio_util's Metadata

     */

android/app/src/com/android/bluetooth/avrcp/AvrcpCoverArtService.java

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public class AvrcpCoverArtService { 
    private static final String TAG = "AvrcpCoverArtService";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);



    private static final int COVER_ART_STORAGE_MAX_ITEMS = 255;

    private static final int COVER_ART_STORAGE_MAX_ITEMS = 32;



    private final Context mContext;

android/app/src/com/android/bluetooth/avrcp/AvrcpCoverArtStorage.java

+2 −2
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ final class AvrcpCoverArtStorage { 
                        hash = key;

                    }

                }

                sb.append(String.format("\n\t\t%-8s : %-32s : %s\n", imageHandle, hash, coverArt));

                sb.append(String.format("\n\t\t%-8s : %-32s : %s", imageHandle, hash, coverArt));

                bytes += coverArt.size();

            }

        }