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

Commit 680d9a58 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge changes from topic "avrcp_cherry_picks" 

* changes:
  Use the current item in the existing queue rather than using metadata
  Don't reject notifications and wait until new addressed player is ready (1/2)
  Check if now playing list is updated by comparing the current queue (1/3)
  AVRCP: Only send the active player for media player listings
  Fix IndexOutOfBounds exception due to incorrect media player start index
  AVRCP: Ignore addressed player changed to telecom
  Prevent stack crash if there is only one player and it isn't active
  Allow AVRCP to send playback state when resumed from pause
  Return on available players changed and clear state for addr player changed
  Initialize the Browsable Player list at user unlock instead of boot complete
  Grab all packages that support browsing instead of connecting to them one by one
  Send the playback state changes to playing only after track changed
  Update the now playing list after AddrPlayerChanged
  Remove dependency on delay by ignoring invalid playback states
  Send available players changed with addressed player changed
parents 7b1f0de4 e0c41bdd

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

+38 −65
Original line number Diff line number Diff line
@@ -54,14 +54,12 @@ public class AddressedMediaPlayer { 
    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 +67,6 @@ public class AddressedMediaPlayer { 
        mNowPlayingList = mEmptyNowPlayingList;

        mMediaInterface = null;

        mLastTrackIdSent = MediaSession.QueueItem.UNKNOWN_ID;

        mNowPlayingListUpdated = false;

    }



    /* get now playing list from addressed player */
@@ -81,7 +78,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,17 +88,17 @@ 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.

        if (Arrays.equals(itemAttr.mUid, AvrcpConstants.TRACK_IS_SELECTED)) {

            if (DEBUG) Log.d(TAG, "getItemAttr: Remote requests for now playing contents:");



            // get the current playing metadata and send.

            getItemAttrFilterAttr(bdaddr, itemAttr, getCurrentQueueItem(mediaController, mediaId),

                    mediaController);

            return;

            mediaId = getActiveQueueItemId(mediaController);

            if (DEBUG) {

                Log.d(TAG,

                        "getItemAttr: Remote requests for now playing contents, sending UID: "

                                + mediaId);

            }

        }



        if (DEBUG) Log.d(TAG, "getItemAttr-UID: 0x" + Utils.byteArrayToString(itemAttr.mUid));
@@ -118,51 +115,17 @@ 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");

            MediaMetadata metadata = mediaController.getMetadata();



            // Because we are database-unaware, we can just number the item here whatever we want

            // because they have to re-poll it every time.

            MediaSession.QueueItem current = getCurrentQueueItem(mediaController, SINGLE_QID);

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

            items.add(current);

        }



        mNowPlayingList = items;



        if (mNowPlayingListUpdated) sendNowPlayingListChanged();



        return mNowPlayingList;

    }



    private void sendNowPlayingListChanged() {

        if (mMediaInterface == null) return;

        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

     * active controller with queue id |qid|.

     */

    private MediaSession.QueueItem getCurrentQueueItem(

            @Nullable MediaController controller, long qid) {

        if (controller == null) {

            MediaDescription.Builder bob = new MediaDescription.Builder();

            bob.setTitle(UNKNOWN_TITLE);

            return new QueueItem(bob.build(), qid);

        }



        MediaMetadata metadata = controller.getMetadata();

            MediaMetadata metadata = mediaController.getMetadata();

            if (metadata == null) {

                Log.w(TAG, "Controller has no metadata!? Making an empty one");

                metadata = (new MediaMetadata.Builder()).build();
@@ -180,8 +143,22 @@ public class AddressedMediaPlayer { 
            bob.setExtras(fillBundle(metadata, desc.getExtras()));



            // build queue item with the new metadata

        desc = bob.build();

        return new QueueItem(desc, qid);

            MediaSession.QueueItem current = new QueueItem(bob.build(), SINGLE_QID);



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

            items.add(current);

        }



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

        mNowPlayingList = items;



        return mNowPlayingList;

    }



    private void sendNowPlayingListChanged() {

        if (mMediaInterface == null) return;

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

        mMediaInterface.nowPlayingChangedRsp(AvrcpConstants.NOTIFICATION_TYPE_CHANGED);

    }



    private Bundle fillBundle(MediaMetadata metadata, Bundle currentExtras) {
@@ -207,15 +184,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 +218,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 +228,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;

    }
@@ -511,7 +482,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"

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

+166 −150

File changed.

Preview size limit exceeded, changes collapsed.