From af25316e28458f581e3556ebb77257211821a396 Mon Sep 17 00:00:00 2001 From: Jaewan Kim Date: Wed, 21 Feb 2018 18:50:32 +0900 Subject: MediaSession2: Remove SessionPlayer2 MediaPlayer2 will provide implementation of MediaPlayerInterface Test: Run all MediaComponents test once Change-Id: Iecdbbcd0cbbdb191cdb228cf09d828565e13fc3d --- media/java/android/media/SessionPlayer2.java | 152 --------------------- .../media/update/SessionPlayer2Provider.java | 55 -------- .../java/android/media/update/StaticProvider.java | 3 - 3 files changed, 210 deletions(-) delete mode 100644 media/java/android/media/SessionPlayer2.java delete mode 100644 media/java/android/media/update/SessionPlayer2Provider.java diff --git a/media/java/android/media/SessionPlayer2.java b/media/java/android/media/SessionPlayer2.java deleted file mode 100644 index 60acf1683bc3..000000000000 --- a/media/java/android/media/SessionPlayer2.java +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Copyright 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media; - -import android.annotation.SystemApi; -import android.content.Context; -import android.media.MediaSession2.PlaylistParams; -import android.media.update.ApiLoader; -import android.media.update.SessionPlayer2Provider; - -import java.util.List; -import java.util.concurrent.Executor; - -/** - * Implementation of the {@link MediaPlayerInterface} which is backed by the {@link MediaPlayer2} - * @hide - */ -public class SessionPlayer2 implements MediaPlayerInterface { - private final SessionPlayer2Provider mProvider; - - public SessionPlayer2(Context context) { - mProvider = ApiLoader.getProvider(context).createSessionPlayer2(context, this); - } - - @Override - public void play() { - mProvider.play_impl(); - } - - @Override - public void prepare() { - mProvider.prepare_impl(); - } - - @Override - public void pause() { - mProvider.pause_impl(); - } - - @Override - public void stop() { - mProvider.stop_impl(); - } - - @Override - public void skipToPrevious() { - mProvider.skipToPrevious_impl(); - } - - @Override - public void skipToNext() { - mProvider.skipToNext_impl(); - } - - @Override - public void seekTo(long pos) { - mProvider.seekTo_impl(pos); - } - - @Override - public void fastForward() { - mProvider.fastForward_impl(); - } - - @Override - public void rewind() { - mProvider.rewind_impl(); - } - - @Override - public PlaybackState2 getPlaybackState() { - return mProvider.getPlaybackState_impl(); - } - - @Override - public void setAudioAttributes(AudioAttributes attributes) { - mProvider.setAudioAttributes_impl(attributes); - } - - @Override - public AudioAttributes getAudioAttributes() { - return mProvider.getAudioAttributes_impl(); - } - - @Override - public void setPlaylist(List playlist) { - mProvider.setPlaylist_impl(playlist); - } - - @Override - public List getPlaylist() { - return mProvider.getPlaylist_impl(); - } - - @Override - public void setCurrentPlaylistItem(int index) { - mProvider.setCurrentPlaylistItem_impl(index); - } - - @Override - public void setPlaylistParams(PlaylistParams params) { - mProvider.setPlaylistParams_impl(params); - } - - @Override - public void addPlaylistItem(int index, MediaItem2 item) { - mProvider.addPlaylistItem_impl(index, item); - } - - @Override - public void removePlaylistItem(MediaItem2 item) { - mProvider.removePlaylistItem_impl(item); - } - - @Override - public PlaylistParams getPlaylistParams() { - return mProvider.getPlaylistParams_impl(); - } - - @Override - public void addPlaybackListener(Executor executor, PlaybackListener listener) { - mProvider.addPlaybackListener_impl(executor, listener); - } - - @Override - public void removePlaybackListener(PlaybackListener listener) { - mProvider.removePlaybackListener_impl(listener); - } - - public MediaPlayer2 getPlayer() { - return mProvider.getPlayer_impl(); - } - - @SystemApi - public SessionPlayer2Provider getProvider() { - return mProvider; - } -} diff --git a/media/java/android/media/update/SessionPlayer2Provider.java b/media/java/android/media/update/SessionPlayer2Provider.java deleted file mode 100644 index e068c211f6d1..000000000000 --- a/media/java/android/media/update/SessionPlayer2Provider.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.update; - -import android.media.AudioAttributes; -import android.media.MediaItem2; -import android.media.MediaPlayer2; -import android.media.MediaPlayerInterface.PlaybackListener; -import android.media.MediaSession2.PlaylistParams; -import android.media.PlaybackState2; - -import java.util.List; -import java.util.concurrent.Executor; - -/** - * @hide - */ -public interface SessionPlayer2Provider { - void play_impl(); - void prepare_impl(); - void pause_impl(); - void stop_impl(); - void skipToPrevious_impl(); - void skipToNext_impl(); - void seekTo_impl(long pos); - void fastForward_impl(); - void rewind_impl(); - PlaybackState2 getPlaybackState_impl(); - void setAudioAttributes_impl(AudioAttributes attributes); - AudioAttributes getAudioAttributes_impl(); - void addPlaylistItem_impl(int index, MediaItem2 item); - void removePlaylistItem_impl(MediaItem2 item); - void setPlaylist_impl(List playlist); - List getPlaylist_impl(); - void setCurrentPlaylistItem_impl(int index); - void setPlaylistParams_impl(PlaylistParams params); - PlaylistParams getPlaylistParams_impl(); - void addPlaybackListener_impl(Executor executor, PlaybackListener listener); - void removePlaybackListener_impl(PlaybackListener listener); - MediaPlayer2 getPlayer_impl(); -} diff --git a/media/java/android/media/update/StaticProvider.java b/media/java/android/media/update/StaticProvider.java index 57f04cc88ff5..4f6f09bedc37 100644 --- a/media/java/android/media/update/StaticProvider.java +++ b/media/java/android/media/update/StaticProvider.java @@ -40,7 +40,6 @@ import android.media.MediaSessionService2; import android.media.MediaSessionService2.MediaNotification; import android.media.PlaybackState2; import android.media.Rating2; -import android.media.SessionPlayer2; import android.media.SessionToken2; import android.media.VolumeProvider2; import android.media.update.MediaLibraryService2Provider.LibraryRootProvider; @@ -113,8 +112,6 @@ public interface StaticProvider { String packageName, String serviceName, int uid); SessionToken2 SessionToken2_fromBundle(Context context, Bundle bundle); - SessionPlayer2Provider createSessionPlayer2(Context context, SessionPlayer2 instance); - MediaItem2Provider createMediaItem2(Context context, MediaItem2 mediaItem2, String mediaId, DataSourceDesc dsd, MediaMetadata2 metadata, int flags); MediaItem2 fromBundle_MediaItem2(Context context, Bundle bundle); -- cgit v1.2.3-59-g8ed1b