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 
am: 007bb68bdb

Change-Id: Iee3057e1d9db477461e2d341c46bad1ef0377cb4
This commit is contained in:
Hyundo Moon
2019-04-23 19:10:59 -07:00
committed by android-build-merger
parent 578e1637bd 007bb68bdb
commit 08e1c031f5
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 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);

25
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.
*
* @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) {
try {
mSessionInfo = mSessionBinder.getSessionInfo();
} catch (RemoteException e) {
Log.d(TAG, "Dead object in getSessionInfo.", e);
}
if (mSessionInfo != null) {
return new Bundle(mSessionInfo);
}
return 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 new Bundle(mSessionInfo);
}
/**