diff options
| author | 2019-03-13 10:41:07 +0900 | |
|---|---|---|
| committer | 2019-03-13 12:04:14 +0900 | |
| commit | 74f4491bd2f6a37b90e648039845a3fd2e2da42d (patch) | |
| tree | dc8a4c83125230c3af1b41c9af85bcec180712b5 | |
| parent | fc0fbbb3af201499c5df7e8d7b813f336bdc2078 (diff) | |
Make Session2Token#getExtras @NonNull
Bug: 128413976
Test: atest CtsMediaTestCases:android.media.cts.MediaSession2Test;
atest CtsMediaTestCases:android.media.cts.MediaController2Test;
atest CtsMediaTestCases:android.media.cts.MediaSession2ServiceTest;
Change-Id: I007efc4318d2bbf0e3849cc00f22ff9dac9784da
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | media/apex/java/android/media/MediaSession2.java | 3 | ||||
| -rw-r--r-- | media/apex/java/android/media/Session2Token.java | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 5b68eb579a79..6ffcbc093864 100644 --- a/api/current.txt +++ b/api/current.txt @@ -26398,7 +26398,7 @@ package android.media { public final class Session2Token implements android.os.Parcelable { ctor public Session2Token(@NonNull android.content.Context, @NonNull android.content.ComponentName); method public int describeContents(); - method @Nullable public android.os.Bundle getExtras(); + method @NonNull public android.os.Bundle getExtras(); method @NonNull public String getPackageName(); method @Nullable public String getServiceName(); method public int getType(); diff --git a/media/apex/java/android/media/MediaSession2.java b/media/apex/java/android/media/MediaSession2.java index 09ac9caf831b..d63de098ecee 100644 --- a/media/apex/java/android/media/MediaSession2.java +++ b/media/apex/java/android/media/MediaSession2.java @@ -511,7 +511,8 @@ public class MediaSession2 implements AutoCloseable { } /** - * Set extras for the session token. + * Set extras for the session token. If null or not set, {@link Session2Token#getExtras()} + * will return {@link Bundle#EMPTY}. * * @return The Builder to allow chaining * @see Session2Token#getExtras() diff --git a/media/apex/java/android/media/Session2Token.java b/media/apex/java/android/media/Session2Token.java index dc970ae1fe1a..d7cb9787cf08 100644 --- a/media/apex/java/android/media/Session2Token.java +++ b/media/apex/java/android/media/Session2Token.java @@ -216,10 +216,11 @@ public final class Session2Token implements Parcelable { /** * @return extras of the token + * @see MediaSession2.Builder#setExtras(Bundle) */ - @Nullable + @NonNull public Bundle getExtras() { - return mExtras; + return mExtras == null ? Bundle.EMPTY : mExtras; } Session2Link getSessionLink() { |