diff options
author | 2019-04-18 16:27:41 +0900 | |
---|---|---|
committer | 2019-04-19 13:17:39 +0900 | |
commit | fb0af603774318a4cf56abfac9928ad1df526229 (patch) | |
tree | c449541b22fd74645daa256de5142932ccd791e5 | |
parent | cf44c4115880569034271637fb941399d57456d3 (diff) |
Change argument of MediaSession2.Builder#setExtras() as @NonNull
Bug: 130777551
Test: make update-api -j;
Change-Id: I39431850d87a6a5e066b83dbbf39e4e9100ac839
-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 af842b5c76bc..ddff849c1c71 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25842,7 +25842,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 6b56ae086a0d..5c1e2043db51 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; } |