Merge "MediaController2: Remove MediaPlaylistAgent in the ControllerCallback" into pi-dev (af5a727e) · Commits · e / os / android_frameworks_av

packages/MediaComponents/src/com/android/media/MediaController2Impl.java

+4 −8

Original line number	Diff line number	Diff line
		@@ -862,8 +862,7 @@ public class MediaController2Impl implements MediaController2Provider {
		if (!mInstance.isConnected()) {
		return;
		}
		// TODO(jaewan): Fix public API not to take playlistAgent.
		mCallback.onPlaylistChanged(mInstance, null, playlist, metadata);
		mCallback.onPlaylistChanged(mInstance, playlist, metadata);
		});
		}

		@@ -875,8 +874,7 @@ public class MediaController2Impl implements MediaController2Provider {
		if (!mInstance.isConnected()) {
		return;
		}
		// TODO(jaewan): Fix public API not to take playlistAgent.
		mCallback.onPlaylistMetadataChanged(mInstance, null, metadata);
		mCallback.onPlaylistMetadataChanged(mInstance, metadata);
		});
		}

		@@ -888,8 +886,7 @@ public class MediaController2Impl implements MediaController2Provider {
		if (!mInstance.isConnected()) {
		return;
		}
		// TODO(jaewan): Fix public API not to take playlistAgent.
		mCallback.onShuffleModeChanged(mInstance, null, shuffleMode);
		mCallback.onShuffleModeChanged(mInstance, shuffleMode);
		});
		}

		@@ -901,8 +898,7 @@ public class MediaController2Impl implements MediaController2Provider {
		if (!mInstance.isConnected()) {
		return;
		}
		// TODO(jaewan): Fix public API not to take playlistAgent.
		mCallback.onRepeatModeChanged(mInstance, null, repeatMode);
		mCallback.onRepeatModeChanged(mInstance, repeatMode);
		});
		}