Merge "Fix nullability in onAudioInfoChanged" into main (99115939) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -26611,7 +26611,7 @@ package android.media.session {

		public abstract static class MediaController.Callback {
		ctor public MediaController.Callback();
		method public void onAudioInfoChanged(android.media.session.MediaController.PlaybackInfo);
		method public void onAudioInfoChanged(@NonNull android.media.session.MediaController.PlaybackInfo);
		method public void onExtrasChanged(@Nullable android.os.Bundle);
		method public void onMetadataChanged(@Nullable android.media.MediaMetadata);
		method public void onPlaybackStateChanged(@Nullable android.media.session.PlaybackState);

+4 −5

Original line number	Diff line number	Diff line
		@@ -614,12 +614,11 @@ public final class MediaController {
		}

		/**
		* Override to handle changes to the audio info.
		* Signals a change in the session's {@link PlaybackInfo PlaybackInfo}.
		*
		* @param info The current audio info for this session.
		* @param playbackInfo The latest known state of the session's playback info.
		*/
		public void onAudioInfoChanged(PlaybackInfo info) {
		}
		public void onAudioInfoChanged(@NonNull PlaybackInfo playbackInfo) {}
		}

		/**
		@@ -1182,7 +1181,7 @@ public final class MediaController {
		}

		@Override
		public void onVolumeInfoChanged(PlaybackInfo info) {
		public void onVolumeInfoChanged(@NonNull PlaybackInfo info) {
		MediaController controller = mController.get();
		if (controller != null) {
		controller.postMessage(MSG_UPDATE_VOLUME, info, null);

+1 −1

Original line number	Diff line number	Diff line
		@@ -278,7 +278,7 @@ public class MediaSessions {
		}

		@Override
		public void onAudioInfoChanged(PlaybackInfo info) {
		public void onAudioInfoChanged(@NonNull PlaybackInfo info) {
		if (D.BUG) {
		Log.d(TAG, cb("onAudioInfoChanged") + Util.playbackInfoToString(info)
		+ " sentRemote=" + sentRemote);

+3 −3

Original line number	Diff line number	Diff line
		@@ -225,9 +225,9 @@ constructor(
		}

		@WorkerThread
		override fun onAudioInfoChanged(info: MediaController.PlaybackInfo?) {
		val newPlaybackType = info?.playbackType ?: PLAYBACK_TYPE_UNKNOWN
		val newPlaybackVolumeControlId = info?.volumeControlId
		override fun onAudioInfoChanged(info: MediaController.PlaybackInfo) {
		val newPlaybackType = info.playbackType
		val newPlaybackVolumeControlId = info.volumeControlId
		if (
		newPlaybackType == playbackType &&
		newPlaybackVolumeControlId == playbackVolumeControlId

+1 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,7 @@ private class MediaControllerCallbackProducer(
		send(MediaControllerChangeModel.ExtrasChanged(extras))
		}

		override fun onAudioInfoChanged(info: MediaController.PlaybackInfo?) {
		override fun onAudioInfoChanged(info: MediaController.PlaybackInfo) {
		send(MediaControllerChangeModel.AudioInfoChanged(info))
		}