Snap for 4678196 from a1c392eb2dbd6ad1c31da7f4f2a99bd77e62f06b to pi-release (9549f600) · Commits · e / os / android_frameworks_av

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

+7 −10

Original line number	Diff line number	Diff line
		@@ -764,7 +764,7 @@ public class MediaController2Impl implements MediaController2Provider {
		}

		@Override
		public long getPosition_impl() {
		public long getCurrentPosition_impl() {
		synchronized (mLock) {
		long timeDiff = System.currentTimeMillis() - mPositionEventTimeMs;
		long expectedPosition = mPositionMs + (long) (mPlaybackSpeed * timeDiff);
		@@ -837,7 +837,8 @@ public class MediaController2Impl implements MediaController2Provider {
		if (!mInstance.isConnected()) {
		return;
		}
		mCallback.onBufferedPositionChanged(mInstance, bufferedPositionMs);
		// TODO(jaewan): Fix this -- it's now buffered state
		//mCallback.onBufferedPositionChanged(mInstance, bufferedPositionMs);
		});
		}

		@@ -862,8 +863,7 @@ public class MediaController2Impl implements MediaController2Provider {
		if (!mInstance.isConnected()) {
		return;
		}
		// TODO(jaewan): Fix public API not to take playlistAgent.
		mCallback.onPlaylistChanged(mInstance, null, playlist, metadata);
		mCallback.onPlaylistChanged(mInstance, playlist, metadata);
		});
		}

		@@ -875,8 +875,7 @@ public class MediaController2Impl implements MediaController2Provider {
		if (!mInstance.isConnected()) {
		return;
		}
		// TODO(jaewan): Fix public API not to take playlistAgent.
		mCallback.onPlaylistMetadataChanged(mInstance, null, metadata);
		mCallback.onPlaylistMetadataChanged(mInstance, metadata);
		});
		}

		@@ -888,8 +887,7 @@ public class MediaController2Impl implements MediaController2Provider {
		if (!mInstance.isConnected()) {
		return;
		}
		// TODO(jaewan): Fix public API not to take playlistAgent.
		mCallback.onShuffleModeChanged(mInstance, null, shuffleMode);
		mCallback.onShuffleModeChanged(mInstance, shuffleMode);
		});
		}

		@@ -901,8 +899,7 @@ public class MediaController2Impl implements MediaController2Provider {
		if (!mInstance.isConnected()) {
		return;
		}
		// TODO(jaewan): Fix public API not to take playlistAgent.
		mCallback.onRepeatModeChanged(mInstance, null, repeatMode);
		mCallback.onRepeatModeChanged(mInstance, repeatMode);
		});
		}

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)