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

Commit 9b72ad09 authored by Hyundo Moon's avatar Hyundo Moon
Browse files

Make MediaController#getSessionInfo() as @NonNull 

Bug: 131069100
Test: atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
Change-Id: I5ecf04fd090dc684f5c7a84c1375de1639f7b4bd
parent 18184f9c

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -27245,7 +27245,7 @@ package android.media.session { 
    method @Nullable public CharSequence getQueueTitle();

    method public int getRatingType();

    method @Nullable public android.app.PendingIntent getSessionActivity();

    method @Nullable public android.os.Bundle getSessionInfo();

    method @NonNull public android.os.Bundle getSessionInfo();

    method @NonNull public android.media.session.MediaSession.Token getSessionToken();

    method @NonNull public android.media.session.MediaController.TransportControls getTransportControls();

    method public void registerCallback(@NonNull android.media.session.MediaController.Callback);

media/java/android/media/session/MediaController.java

+15 −8
Original line number Diff line number Diff line
@@ -414,18 +414,25 @@ public final class MediaController { 
    /**

     * Gets the additional session information which was set when the session was created.

     *

     * @return The additional session information

     * @return The additional session information, or {@link Bundle#EMPTY} if not set.

     */

    @Nullable

    @NonNull

    public Bundle getSessionInfo() {

        if (mSessionInfo == null) {

        if (mSessionInfo != null) {

            return new Bundle(mSessionInfo);

        }



        // Get info from the connected session.

        try {

            mSessionInfo = mSessionBinder.getSessionInfo();

        } catch (RemoteException e) {

            Log.d(TAG, "Dead object in getSessionInfo.", e);

        }



        if (mSessionInfo == null) {

            mSessionInfo = Bundle.EMPTY;

        }

        return mSessionInfo;

        return new Bundle(mSessionInfo);

    }



    /**