Merge "AVRCP: Prevent concurrent access of Browser List"

    private SortedMap<Integer, MediaPlayerInfo> mMediaPlayerInfoList;

    /* List of media players which supports browse */

    private ArrayList<BrowsePlayerInfo> mBrowsePlayerInfoList;

    private List<BrowsePlayerInfo> mBrowsePlayerInfoList;

    /* Manage browsed players */

    private AvrcpBrowseManager mAvrcpBrowseManager;

        mMediaControllerCb = new MediaControllerListener();

        mAvrcpMediaRsp = new AvrcpMediaRsp();

        mMediaPlayerInfoList = new TreeMap<Integer, MediaPlayerInfo>();

        mBrowsePlayerInfoList = new ArrayList<BrowsePlayerInfo>();

        mBrowsePlayerInfoList = Collections.synchronizedList(new ArrayList<BrowsePlayerInfo>());

        mPassthroughDispatched = 0;

        mPassthroughLogs = new EvictingQueue<MediaKeyLog>(PASSTHROUGH_LOG_MAX_SIZE);

        mPassthroughPending = Collections.synchronizedList(new ArrayList<MediaKeyLog>());

            mCurrentBrowser = null;

            mBrowsePlayerInfoList.add(mCurrentPlayer);

            MediaPlayerInfo info = getMediaPlayerInfo(mCurrentPlayer.packageName);

            if (info != null) {

            MediaController controller = (info == null) ? null : info.getMediaController();

            // Refresh the media player entry so it notices we can browse

                MediaController controller = info.getMediaController();

            if (controller != null) {

                addMediaPlayerController(controller.getWrappedInstance());

                }

                // If there's no controller, the entry is already browsable-only.

            } else {

                addMediaPlayerPackage(mCurrentPlayer.packageName);

            }