Merge "AVRCP: Try update media metadata on app force quit" (c041830d) · Commits · e / os / android_packages_modules_Bluetooth

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

+17 −0

Original line number	Diff line number	Diff line
		@@ -459,6 +459,15 @@ public class MediaPlayerList {
		if (playerId == mActivePlayerId && playerId != NO_ACTIVE_PLAYER) {
		getActivePlayer().unregisterCallback();
		mActivePlayerId = NO_ACTIVE_PLAYER;
		List<Metadata> queue = new ArrayList<Metadata>();
		queue.add(Util.empty_data());
		MediaData newData = new MediaData(
		Util.empty_data(),
		null,
		queue
		);

		sendMediaUpdate(newData);
		}

		final MediaPlayerWrapper wrapper = mMediaPlayers.get(playerId);
		@@ -607,6 +616,14 @@ public class MediaPlayerList {

		sendMediaUpdate(data);
		}

		@Override
		public void sessionUpdatedCallback(String packageName) {
		if (packageName != null && mMediaPlayerIds.containsKey(packageName)) {
		Log.d(TAG, "sessionUpdatedCallback(): packageName: " + packageName);
		removeMediaPlayer(mMediaPlayerIds.get(packageName));
		}
		}
		};

		private final MediaSessionManager.Callback mButtonDispatchCallback =

+2 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@ class MediaPlayerWrapper {

		public interface Callback {
		void mediaUpdatedCallback(MediaData data);
		void sessionUpdatedCallback(String packageName);
		}

		boolean isPlaybackStateReady() {
		@@ -471,6 +472,7 @@ class MediaPlayerWrapper {
		@Override
		public void onSessionDestroyed() {
		Log.w(TAG, "The session was destroyed " + mPackageName);
		mRegisteredCallback.sessionUpdatedCallback(mPackageName);
		}

		@VisibleForTesting