Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74f4491b authored by Hyundo Moon's avatar Hyundo Moon
Browse files

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
parent fc0fbbb3
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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();
+2 −1
Original line number Diff line number Diff line
@@ -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()
+3 −2
Original line number Diff line number Diff line
@@ -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() {