Merge "Always assign a free ID to the new MediaPlayer" am: 8e6ebafe7c am: f3bfc85f42 (da3db52a) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/newavrcp/MediaPlayerList.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -152,7 +152,7 @@ public class MediaPlayerList {
		for (BrowsedPlayerWrapper wrapper : players) {
		// Generate new id and add the browsable player
		if (!mMediaPlayerIds.containsKey(wrapper.getPackageName())) {
		mMediaPlayerIds.put(wrapper.getPackageName(), mMediaPlayerIds.size() + 1);
		mMediaPlayerIds.put(wrapper.getPackageName(), getFreeMediaPlayerId());
		}

		d("Adding Browser Wrapper for " + wrapper.getPackageName() + " with id "
		@@ -206,6 +206,12 @@ public class MediaPlayerList {
		return BLUETOOTH_PLAYER_ID;
		}

		int getFreeMediaPlayerId() {
		int id = 0;
		while (mMediaPlayerIds.containsValue(++id)) {}
		return id;
		}

		MediaPlayerWrapper getActivePlayer() {
		return mMediaPlayers.get(mActivePlayerId);
		}
		@@ -405,7 +411,7 @@ public class MediaPlayerList {
		// that key.
		String packageName = controller.getPackageName();
		if (!mMediaPlayerIds.containsKey(packageName)) {
		mMediaPlayerIds.put(packageName, mMediaPlayerIds.size() + 1);
		mMediaPlayerIds.put(packageName, getFreeMediaPlayerId());
		}

		int playerId = mMediaPlayerIds.get(packageName);