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

Commit 07752561 authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

AVRCP: Only send the active player for media player listings

am: 1032e7ec

Change-Id: I280229c38b441b0809226c6e5bade4c4ce58640d
parents df54ca8f 1032e7ec
Loading
Loading
Loading
Loading
+10 −2
Original line number Diff line number Diff line
@@ -2043,7 +2043,12 @@ public final class Avrcp {
    /* prepare media list & return the media player list response object */
    private MediaPlayerListRsp prepareMediaPlayerRspObj() {
        synchronized (mMediaPlayerInfoList) {
            int numPlayers = mMediaPlayerInfoList.size();
            // TODO(apanicke): This hack will go away as soon as a developer
            // option to enable or disable player selection is created. Right
            // now this is needed to fix BMW i3 carkits and any other carkits
            // that might try to connect to a player that isnt the current
            // player based on this list
            int numPlayers = 1;

            int[] playerIds = new int[numPlayers];
            byte[] playerTypes = new byte[numPlayers];
@@ -2058,7 +2063,10 @@ public final class Avrcp {
            int players = mMediaPlayerInfoList.containsKey(mCurrAddrPlayerID) ? 1 : 0;
            for (Map.Entry<Integer, MediaPlayerInfo> entry : mMediaPlayerInfoList.entrySet()) {
                int idx = players;
                if (entry.getKey() == mCurrAddrPlayerID) idx = 0;
                if (entry.getKey() == mCurrAddrPlayerID)
                    idx = 0;
                else
                    continue; // TODO(apanicke): Remove, see above note
                MediaPlayerInfo info = entry.getValue();
                playerIds[idx] = entry.getKey();
                playerTypes[idx] = info.getMajorType();