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

Merge "Change argument of MediaSession2.Builder#setExtras() as @NonNull" into qt-dev

Browse Source 
am: 1b92e90402

Change-Id: I54b19ea29e4ad728b9e3f85bc26668d406b2ccf0
This commit is contained in:
Hyundo Moon
2019-04-19 00:10:15 -07:00
committed by android-build-merger
parent 115ea4aaf9 1b92e90402
commit f55b09e966
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -25831,7 +25831,7 @@ package android.media {
public static final class MediaSession2.Builder {
ctor public MediaSession2.Builder(@NonNull android.content.Context);
method @NonNull public android.media.MediaSession2 build();
method @NonNull public android.media.MediaSession2.Builder setExtras(@Nullable android.os.Bundle);
method @NonNull public android.media.MediaSession2.Builder setExtras(@NonNull android.os.Bundle);
method @NonNull public android.media.MediaSession2.Builder setId(@NonNull String);
method @NonNull public android.media.MediaSession2.Builder setSessionActivity(@Nullable android.app.PendingIntent);
method @NonNull public android.media.MediaSession2.Builder setSessionCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.MediaSession2.SessionCallback);

5
media/apex/java/android/media/MediaSession2.java
View File

@@ -522,7 +522,10 @@ public class MediaSession2 implements AutoCloseable {
* @see Session2Token#getExtras()
*/
@NonNull
public Builder setExtras(@Nullable Bundle extras) {
public Builder setExtras(@NonNull Bundle extras) {
if (extras == null) {
throw new NullPointerException("extras shouldn't be null");
}
mExtras = extras;
return this;
}