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

Commit 825deafe authored by Jin Seok Park's avatar Jin Seok Park Committed by android-build-merger
Browse files

Merge "Rename MediaSession2/MediaController2 methods" into qt-dev 

am: 1c410605

Change-Id: Id1d20ab9560838b833ea95d90effdcad18d087cf
parents fa8bc70d 1c410605

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -24656,7 +24656,7 @@ package android.media { 
  public class MediaController2 implements java.lang.AutoCloseable {

    method public void cancelSessionCommand(@NonNull Object);

    method public void close();

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

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

    method public boolean isPlaybackActive();

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

  }
@@ -25821,8 +25821,8 @@ package android.media { 
    method public void cancelSessionCommand(@NonNull android.media.MediaSession2.ControllerInfo, @NonNull Object);

    method public void close();

    method @NonNull public java.util.List<android.media.MediaSession2.ControllerInfo> getConnectedControllers();

    method @NonNull public String getSessionId();

    method @NonNull public android.media.Session2Token getSessionToken();

    method @NonNull public String getId();

    method @NonNull public android.media.Session2Token getToken();

    method public boolean isPlaybackActive();

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

    method public void setPlaybackActive(boolean);

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

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ public class MediaController2 implements AutoCloseable { 
     * @return Session2Token of the connected session, or {@code null} if not connected

     */

    @Nullable

    public Session2Token getConnectedSessionToken() {

    public Session2Token getConnectedToken() {

        synchronized (mLock) {

            return mConnectedToken;

        }

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

+3 −3
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public class MediaSession2 implements AutoCloseable { 
     * Returns the session ID

     */

    @NonNull

    public String getSessionId() {

    public String getId() {

        return mSessionId;

    }
@@ -161,7 +161,7 @@ public class MediaSession2 implements AutoCloseable { 
     * Returns the {@link Session2Token} for creating {@link MediaController2}.

     */

    @NonNull

    public Session2Token getSessionToken() {

    public Session2Token getToken() {

        return mSessionToken;

    }
@@ -553,7 +553,7 @@ public class MediaSession2 implements AutoCloseable { 
            try {

                MediaSessionManager manager = (MediaSessionManager) mContext.getSystemService(

                        Context.MEDIA_SESSION_SERVICE);

                manager.notifySession2Created(session2.getSessionToken());

                manager.notifySession2Created(session2.getToken());

            } catch (Exception e) {

                session2.close();

                throw e;

media/apex/java/android/media/MediaSession2Service.java

+5 −5
Original line number Diff line number Diff line
@@ -195,15 +195,15 @@ public abstract class MediaSession2Service extends Service { 
            throw new IllegalArgumentException("session is already closed");

        }

        synchronized (mLock) {

            MediaSession2 previousSession = mSessions.get(session.getSessionId());

            MediaSession2 previousSession = mSessions.get(session.getId());

            if (previousSession != null) {

                if (previousSession != session) {

                    Log.w(TAG, "Session ID should be unique, ID=" + session.getSessionId()

                    Log.w(TAG, "Session ID should be unique, ID=" + session.getId()

                            + ", previous=" + previousSession + ", session=" + session);

                }

                return;

            }

            mSessions.put(session.getSessionId(), session);

            mSessions.put(session.getId(), session);

            session.setForegroundServiceEventCallback(mForegroundServiceEventCallback);

        }

    }
@@ -220,11 +220,11 @@ public abstract class MediaSession2Service extends Service { 
        }

        MediaNotification notification;

        synchronized (mLock) {

            if (mSessions.get(session.getSessionId()) != session) {

            if (mSessions.get(session.getId()) != session) {

                // Session isn't added or removed already.

                return;

            }

            mSessions.remove(session.getSessionId());

            mSessions.remove(session.getId());

            notification = mNotifications.remove(session);

        }

        session.setForegroundServiceEventCallback(null);