commit a1c392eb2dbd6ad1c31da7f4f2a99bd77e62f06b
author Jaewan Kim <jaewan@google.com> Mon Mar 26 05:12:18 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 26 05:12:18 2018 +0000
tree 2d0efe2ccf34ea33d0280b7a348e232696d37f5b
parent aec686dc2994ae6e70211cdde96b08a20a609df7
parent fcfde5fa27d3a415bed47fd2e83398dfce88fbe3

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

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 89c29e6..a269c96 100644
--- a/packages/MediaComponents/src/com/android/media/MediaSession2Impl.java
+++ b/packages/MediaComponents/src/com/android/media/MediaSession2Impl.java
@@ -669,7 +669,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)