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

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

Merge "Change argument of MediaSession2.Builder#setExtras() as @NonNull" into qt-dev

parents 1a7a6fa3 fb0af603

api/current.txt

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

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

+4 −1
Original line number Diff line number Diff line
@@ -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;

        }