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

Commit 063f2bf9 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [2779825, 2780206, 2780207, 2780102, 2780103, 2779826,... 

Merge cherrypicks of [2779825, 2780206, 2780207, 2780102, 2780103, 2779826, 2779827, 2779722, 2779723, 2779973, 2780208, 2780209, 2780210, 2780211, 2780212, 2780213, 2779703, 2779704, 2779705, 2779706, 2779707, 2779708, 2779709, 2780214, 2779828, 2779829, 2779454, 2779724] into oc-r3-release

Change-Id: Ic19678a3f1a4377d5a04d983b01a7dd2f1feef55
parents c1e597d8 a093b5ad

src/com/android/bluetooth/avrcp/AddressedMediaPlayer.java

+28 −24
Original line number Diff line number Diff line
@@ -48,20 +48,21 @@ public class AddressedMediaPlayer { 
    static private final long SINGLE_QID = 1;

    static private final String UNKNOWN_TITLE = "(unknown)";



    static private final String GPM_BUNDLE_METADATA_KEY =

            "com.google.android.music.mediasession.music_metadata";



    private AvrcpMediaRspInterface mMediaInterface;

    private @NonNull List<MediaSession.QueueItem> mNowPlayingList;



    private final List<MediaSession.QueueItem> mEmptyNowPlayingList;



    private long mLastTrackIdSent;

    private boolean mNowPlayingListUpdated;



    public AddressedMediaPlayer(AvrcpMediaRspInterface mediaInterface) {

        mEmptyNowPlayingList = new ArrayList<MediaSession.QueueItem>();

        mNowPlayingList = mEmptyNowPlayingList;

        mMediaInterface = mediaInterface;

        mLastTrackIdSent = MediaSession.QueueItem.UNKNOWN_ID;

        mNowPlayingListUpdated = false;

    }



    void cleanup() {
@@ -69,7 +70,6 @@ public class AddressedMediaPlayer { 
        mNowPlayingList = mEmptyNowPlayingList;

        mMediaInterface = null;

        mLastTrackIdSent = MediaSession.QueueItem.UNKNOWN_ID;

        mNowPlayingListUpdated = false;

    }



    /* get now playing list from addressed player */
@@ -81,7 +81,7 @@ public class AddressedMediaPlayer { 
            mMediaInterface.folderItemsRsp(bdaddr, AvrcpConstants.RSP_NO_AVBL_PLAY, null);

            return;

        }

        List<MediaSession.QueueItem> items = getNowPlayingList(mediaController);

        List<MediaSession.QueueItem> items = updateNowPlayingList(mediaController);

        getFolderItemsFilterAttr(bdaddr, reqObj, items, AvrcpConstants.BTRC_SCOPE_NOW_PLAYING,

                reqObj.mStartItem, reqObj.mEndItem, mediaController);

    }
@@ -91,7 +91,7 @@ public class AddressedMediaPlayer { 
            @Nullable MediaController mediaController) {

        int status = AvrcpConstants.RSP_NO_ERROR;

        long mediaId = ByteBuffer.wrap(itemAttr.mUid).getLong();

        List<MediaSession.QueueItem> items = getNowPlayingList(mediaController);

        List<MediaSession.QueueItem> items = updateNowPlayingList(mediaController);



        // NOTE: this is out-of-spec (AVRCP 1.6.1 sec 6.10.4.3, p90) but we answer it anyway

        // because some CTs ask for it.
@@ -118,14 +118,10 @@ public class AddressedMediaPlayer { 


    /* Refresh and get the queue of now playing.

     */

    private @NonNull List<MediaSession.QueueItem> getNowPlayingList(

            @Nullable MediaController mediaController) {

    @NonNull

    List<MediaSession.QueueItem> updateNowPlayingList(@Nullable MediaController mediaController) {

        if (mediaController == null) return mEmptyNowPlayingList;

        List<MediaSession.QueueItem> items = mediaController.getQueue();

        if (items != null && !mNowPlayingListUpdated) {

            mNowPlayingList = items;

            return mNowPlayingList;

        }

        if (items == null) {

            Log.i(TAG, "null queue from " + mediaController.getPackageName()

                            + ", constructing single-item list");
@@ -137,18 +133,17 @@ public class AddressedMediaPlayer { 
            items.add(current);

        }



        if (!items.equals(mNowPlayingList)) sendNowPlayingListChanged();

        mNowPlayingList = items;



        if (mNowPlayingListUpdated) sendNowPlayingListChanged();



        return mNowPlayingList;

    }



    private void sendNowPlayingListChanged() {

        if (mMediaInterface == null) return;

        if (DEBUG) Log.d(TAG, "sendNowPlayingListChanged()");

        mMediaInterface.uidsChangedRsp(AvrcpConstants.NOTIFICATION_TYPE_CHANGED);

        mMediaInterface.nowPlayingChangedRsp(AvrcpConstants.NOTIFICATION_TYPE_CHANGED);

        mNowPlayingListUpdated = false;

    }



    /* Constructs a queue item representing the current playing metadata from an
@@ -186,6 +181,7 @@ public class AddressedMediaPlayer { 


    private Bundle fillBundle(MediaMetadata metadata, Bundle currentExtras) {

        if (metadata == null) {

            Log.i(TAG, "fillBundle: metadata is null");

            return currentExtras;

        }
@@ -207,15 +203,10 @@ public class AddressedMediaPlayer { 
        return bundle;

    }



    void updateNowPlayingList(@Nullable MediaController mediaController) {

        mNowPlayingListUpdated = true;

        getNowPlayingList(mediaController);

    }



    /* Instructs media player to play particular media item */

    void playItem(byte[] bdaddr, byte[] uid, @Nullable MediaController mediaController) {

        long qid = ByteBuffer.wrap(uid).getLong();

        List<MediaSession.QueueItem> items = getNowPlayingList(mediaController);

        List<MediaSession.QueueItem> items = updateNowPlayingList(mediaController);



        if (mediaController == null) {

            Log.e(TAG, "No mediaController when PlayItem " + qid + " requested");
@@ -246,7 +237,7 @@ public class AddressedMediaPlayer { 
    }



    void getTotalNumOfItems(byte[] bdaddr, @Nullable MediaController mediaController) {

        List<MediaSession.QueueItem> items = getNowPlayingList(mediaController);

        List<MediaSession.QueueItem> items = updateNowPlayingList(mediaController);

        if (DEBUG) Log.d(TAG, "getTotalNumOfItems: " + items.size() + " items.");

        mMediaInterface.getTotalNumOfItemsRsp(bdaddr, AvrcpConstants.RSP_NO_ERROR, 0, items.size());

    }
@@ -256,7 +247,6 @@ public class AddressedMediaPlayer { 
        long qid = getActiveQueueItemId(mediaController);

        byte[] track = ByteBuffer.allocate(AvrcpConstants.UID_SIZE).putLong(qid).array();

        // The nowPlayingList changed: the new list has the full data for the current item

        if (type == AvrcpConstants.NOTIFICATION_TYPE_CHANGED) sendNowPlayingListChanged();

        mMediaInterface.trackChangedRsp(type, track);

        mLastTrackIdSent = qid;

    }
@@ -391,10 +381,22 @@ public class AddressedMediaPlayer { 
            MediaDescription desc = item.getDescription();

            Bundle extras = desc.getExtras();

            boolean isCurrentTrack = item.getQueueId() == getActiveQueueItemId(mediaController);

            MediaMetadata data = null;

            if (isCurrentTrack) {

                if (DEBUG) Log.d(TAG, "getAttrValue: item is active, using current data");

                extras = fillBundle(mediaController.getMetadata(), extras);

                data = mediaController.getMetadata();

                if (data == null)

                    Log.e(TAG, "getMetadata didn't give us any metadata for the current track");

            }



            if (data == null) {

                // TODO: This code can be removed when b/63117921 is resolved

                data = (MediaMetadata) extras.get(GPM_BUNDLE_METADATA_KEY);

                extras = null; // We no longer need the data in here

            }



            extras = fillBundle(data, extras);



            if (DEBUG) Log.d(TAG, "getAttrValue: item " + item + " : " + desc);

            switch (attr) {

                case AvrcpConstants.ATTRID_TITLE:
@@ -511,7 +513,9 @@ public class AddressedMediaPlayer { 
    private long getActiveQueueItemId(@Nullable MediaController controller) {

        if (controller == null) return MediaSession.QueueItem.UNKNOWN_ID;

        PlaybackState state = controller.getPlaybackState();

        if (state == null) return MediaSession.QueueItem.UNKNOWN_ID;

        if (state == null || state.getState() == PlaybackState.STATE_BUFFERING

                || state.getState() == PlaybackState.STATE_NONE)

            return MediaSession.QueueItem.UNKNOWN_ID;

        long qid = state.getActiveQueueItemId();

        if (qid != MediaSession.QueueItem.UNKNOWN_ID) return qid;

        // Check if we're presenting a "one item queue"