diff options
| author | 2019-04-19 06:52:03 +0000 | |
|---|---|---|
| committer | 2019-04-19 06:52:03 +0000 | |
| commit | 1b92e904025d4dbcebc4bc324f363df618937e92 (patch) | |
| tree | d3deecdd44ef95bbef3bbbc5557fc3ba9be7fc74 | |
| parent | 1a7a6fa3d4a248176baa9d6ac7819dbe7a6b7ea7 (diff) | |
| parent | fb0af603774318a4cf56abfac9928ad1df526229 (diff) | |
Merge "Change argument of MediaSession2.Builder#setExtras() as @NonNull" into qt-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | media/apex/java/android/media/MediaSession2.java | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index ab698db7fc3a..6253dfd4058c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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); diff --git a/media/apex/java/android/media/MediaSession2.java b/media/apex/java/android/media/MediaSession2.java index 0a1edb8d7712..081911896c04 100644 --- a/media/apex/java/android/media/MediaSession2.java +++ b/media/apex/java/android/media/MediaSession2.java @@ -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; } |