Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make MediaController#getSessionInfo() as @NonNull" into qt-dev

Browse Source
This commit is contained in:
Hyundo Moon
2019-04-24 01:31:39 +00:00
committed by Android (Google) Code Review
parent b9177522ff 9b72ad0924
commit 007bb68bdb
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -27245,7 +27245,7 @@ package android.media.session {
method @Nullable public CharSequence getQueueTitle(); method @Nullable public CharSequence getQueueTitle();
method public int getRatingType(); method public int getRatingType();
method @Nullable public android.app.PendingIntent getSessionActivity(); 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.MediaSession.Token getSessionToken();
method @NonNull public android.media.session.MediaController.TransportControls getTransportControls(); method @NonNull public android.media.session.MediaController.TransportControls getTransportControls();
method public void registerCallback(@NonNull android.media.session.MediaController.Callback); method public void registerCallback(@NonNull android.media.session.MediaController.Callback);

15
media/java/android/media/session/MediaController.java
View File

@@ -414,18 +414,25 @@ public final class MediaController {
/** /**
* Gets the additional session information which was set when the session was created. * 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() { public Bundle getSessionInfo() {
if (mSessionInfo == null) { if (mSessionInfo != null) {
return new Bundle(mSessionInfo);
}
// Get info from the connected session.
try { try {
mSessionInfo = mSessionBinder.getSessionInfo(); mSessionInfo = mSessionBinder.getSessionInfo();
} catch (RemoteException e) { } catch (RemoteException e) {
Log.d(TAG, "Dead object in getSessionInfo.", e); Log.d(TAG, "Dead object in getSessionInfo.", e);
} }
if (mSessionInfo == null) {
mSessionInfo = Bundle.EMPTY;
} }
return mSessionInfo; return new Bundle(mSessionInfo);
} }
/** /**