Merge "AVRCP: Fix NPE in removeMediaController" (6a7d87ea) · Commits · e / os / android_packages_modules_Bluetooth

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -1769,8 +1769,9 @@ public final class Avrcp {
		new ArrayList<android.media.session.MediaController>();
		synchronized (mMediaPlayerInfoList) {
		for (MediaPlayerInfo info : mMediaPlayerInfoList.values()) {
		if (info.getMediaController() != null) {
		controllers.add(info.getMediaController().getWrappedInstance());
		MediaController controller = info.getMediaController();
		if (controller != null) {
		controllers.add(controller.getWrappedInstance());
		}
		}
		}
		@@ -1848,7 +1849,8 @@ public final class Avrcp {
		private void removeMediaController(android.media.session.MediaController controller) {
		synchronized (mMediaPlayerInfoList) {
		for (MediaPlayerInfo info : mMediaPlayerInfoList.values()) {
		if (info.getMediaController().equals(controller)) info.setMediaController(null);
		MediaController c = info.getMediaController();
		if (c != null && c.equals(controller)) info.setMediaController(null);
		}
		}
		}