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

Commit d8ef6c15 authored by Jack He's avatar Jack He Committed by android-build-merger
Browse files

Merge "AVRCP: Fix deadlock between Avrcp.this and mMediaPlayerInfoList" am: 0e80ffec 

am: 4784885a

Change-Id: Ide8c1f8afc5121d8c84b8af234a0c7a02564e002
parents ea02934a 4784885a

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

+4 −5
Original line number Diff line number Diff line
@@ -1843,12 +1843,11 @@ public final class Avrcp { 
                mAvailablePlayerViewChanged = true;

            }

            mMediaPlayerInfoList.put(updateId, info);

            if (DEBUG)

                Log.d(TAG, (updated ? "update #" : "add #") + updateId + ":" + info.toString());

        }

        if (DEBUG) Log.d(TAG, (updated ? "update #" : "add #") + updateId + ":" + info.toString());

        if (currentRemoved || updateId == mCurrAddrPlayerID) {

            updateCurrentController(updateId, mCurrBrowsePlayerID);

        }

        }

        return updated;

    }