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

Commit 331326dd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make Session2Token#getExtras @NonNull"

parents 00d3b38e 74f4491b

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -26421,7 +26421,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();

media/apex/java/android/media/MediaSession2.java

+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()

media/apex/java/android/media/Session2Token.java

+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() {