Merge "Fix nullability in MediaController#getPlaybackInfo()" into main (66c34f27) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -26592,7 +26592,7 @@ package android.media.session {
		method public long getFlags();
		method @Nullable public android.media.MediaMetadata getMetadata();
		method public String getPackageName();
		method @Nullable public android.media.session.MediaController.PlaybackInfo getPlaybackInfo();
		method @NonNull public android.media.session.MediaController.PlaybackInfo getPlaybackInfo();
		method @Nullable public android.media.session.PlaybackState getPlaybackState();
		method @Nullable public java.util.List<android.media.session.MediaSession.QueueItem> getQueue();
		method @Nullable public CharSequence getQueueTitle();

+5 −9

Original line number	Diff line number	Diff line
		@@ -252,18 +252,14 @@ public final class MediaController {
		return 0;
		}

		/**
		* Get the current playback info for this session.
		*
		* @return The current playback info or null.
		*/
		public @Nullable PlaybackInfo getPlaybackInfo() {
		/** Returns the current playback info for this session. */
		@NonNull
		public PlaybackInfo getPlaybackInfo() {
		try {
		return mSessionBinder.getVolumeAttributes();
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling getAudioInfo.", e);
		} catch (RemoteException ex) {
		throw ex.rethrowFromSystemServer();
		}
		return null;
		}

		/**

+2 −0

Original line number	Diff line number	Diff line
		@@ -1057,6 +1057,7 @@ public class MediaSessionRecord extends MediaSessionRecordImpl implements IBinde
		return -1;
		}

		@NonNull
		private PlaybackInfo getVolumeAttributes() {
		int volumeType;
		AudioAttributes attributes;
		@@ -1850,6 +1851,7 @@ public class MediaSessionRecord extends MediaSessionRecordImpl implements IBinde
		return mFlags;
		}

		@NonNull
		@Override
		public PlaybackInfo getVolumeAttributes() {
		return MediaSessionRecord.this.getVolumeAttributes();