Merge "Make MediaController#getSessionInfo() as @NonNull" into qt-dev (007bb68b) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -27245,7 +27245,7 @@ package android.media.session {
		method @Nullable public CharSequence getQueueTitle();
		method public int getRatingType();
		method @Nullable public android.app.PendingIntent getSessionActivity();
		method @Nullable public android.os.Bundle getSessionInfo();
		method @NonNull public android.os.Bundle getSessionInfo();
		method @NonNull public android.media.session.MediaSession.Token getSessionToken();
		method @NonNull public android.media.session.MediaController.TransportControls getTransportControls();
		method public void registerCallback(@NonNull android.media.session.MediaController.Callback);

+15 −8

Original line number	Diff line number	Diff line
		@@ -414,18 +414,25 @@ public final class MediaController {
		/**
		* Gets the additional session information which was set when the session was created.
		*
		* @return The additional session information
		* @return The additional session information, or {@link Bundle#EMPTY} if not set.
		*/
		@Nullable
		@NonNull
		public Bundle getSessionInfo() {
		if (mSessionInfo == null) {
		if (mSessionInfo != null) {
		return new Bundle(mSessionInfo);
		}

		// Get info from the connected session.
		try {
		mSessionInfo = mSessionBinder.getSessionInfo();
		} catch (RemoteException e) {
		Log.d(TAG, "Dead object in getSessionInfo.", e);
		}

		if (mSessionInfo == null) {
		mSessionInfo = Bundle.EMPTY;
		}
		return mSessionInfo;
		return new Bundle(mSessionInfo);
		}

		/**