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

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

Merge "MediaSession2: Match APIs with MediaPlayerBase" into pi-dev

parents aec686dc fcfde5fa

packages/MediaComponents/src/com/android/media/MediaSession2Impl.java

+1 −1
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ public class MediaSession2Impl implements MediaSession2Provider { 
    }



    @Override

    public long getPosition_impl() {

    public long getCurrentPosition_impl() {

        final MediaPlayerBase player = mPlayer;

        if (player != null) {

            return mPlayer.getCurrentPosition();

packages/MediaComponents/src/com/android/media/MediaSession2Stub.java

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ public class MediaSession2Stub extends IMediaSession2.Stub { 
                //       use thread poll for incoming calls.

                final int playerState = session.getInstance().getPlayerState();

                final long positionEventTimeMs = System.currentTimeMillis();

                final long positionMs = session.getInstance().getPosition();

                final long positionMs = session.getInstance().getCurrentPosition();

                final float playbackSpeed = session.getInstance().getPlaybackSpeed();

                final long bufferedPositionMs = session.getInstance().getBufferedPosition();

                final Bundle playbackInfoBundle = ((MediaController2Impl.PlaybackInfoImpl)