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

Commit 7f3675c5 authored by Jaewan Kim's avatar Jaewan Kim Committed by Android (Google) Code Review
Browse files

Merge "MediaController2: Add @Nullable to getConnectedSessionToken()"

parents 66d64cd4 e5c876a8

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -24650,7 +24650,7 @@ package android.media { 
    ctor public MediaController2(@NonNull android.content.Context, @NonNull android.media.Session2Token, @NonNull java.util.concurrent.Executor, @NonNull android.media.MediaController2.ControllerCallback);

    method public void cancelSessionCommand(@NonNull Object);

    method public void close();

    method public android.media.Session2Token getConnectedSessionToken();

    method @Nullable public android.media.Session2Token getConnectedSessionToken();

    method public boolean isPlaybackActive();

    method @NonNull public Object sendSessionCommand(@NonNull android.media.Session2Command, @Nullable android.os.Bundle);

  }

media/apex/java/android/media/MediaController2.java

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ public class MediaController2 implements AutoCloseable { 
     *

     * @return Session2Token of the connected session, or {@code null} if not connected

     */

    @Nullable

    public Session2Token getConnectedSessionToken() {

        synchronized (mLock) {

            return mConnectedToken;