commit fcfde5fa27d3a415bed47fd2e83398dfce88fbe3
author Jaewan Kim <jaewan@google.com> Fri Mar 23 16:08:27 2018 +0900
committer Jaewan Kim <jaewan@google.com> Fri Mar 23 16:08:27 2018 +0900
tree 19193554521b9820e937d343b9d1dc5d65540072
parent ec57d7b565e1352e2c76040fb5df7614a164b157

MediaSession2: Match APIs with MediaPlayerBase

Bug: 75500592
Test: Build
Change-Id: I4c5394a732e988095e779522ebab746eda3eb019

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

diff --git a/packages/MediaComponents/src/com/android/media/MediaSession2Impl.java b/packages/MediaComponents/src/com/android/media/MediaSession2Impl.java
index d513034..6ff98be 100644
--- a/packages/MediaComponents/src/com/android/media/MediaSession2Impl.java
+++ b/packages/MediaComponents/src/com/android/media/MediaSession2Impl.java
@@ -658,7 +658,7 @@
     }
 
     @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

diff --git a/packages/MediaComponents/src/com/android/media/MediaSession2Stub.java b/packages/MediaComponents/src/com/android/media/MediaSession2Stub.java
index caf834a..e909fc5 100644
--- a/packages/MediaComponents/src/com/android/media/MediaSession2Stub.java
+++ b/packages/MediaComponents/src/com/android/media/MediaSession2Stub.java
@@ -389,7 +389,7 @@
                 //       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)