diff options
| -rw-r--r-- | core/java/android/widget/MediaControlView2.java | 1 | ||||
| -rw-r--r-- | core/java/android/widget/VideoView2.java | 36 | ||||
| -rw-r--r-- | media/java/android/media/update/VideoView2Provider.java | 13 |
3 files changed, 1 insertions, 49 deletions
diff --git a/core/java/android/widget/MediaControlView2.java b/core/java/android/widget/MediaControlView2.java index adc443214458..3ec8ab9240bd 100644 --- a/core/java/android/widget/MediaControlView2.java +++ b/core/java/android/widget/MediaControlView2.java @@ -176,6 +176,7 @@ public class MediaControlView2 extends ViewGroupHelper<MediaControlView2Provider * @hide TODO: remove once the implementation is revised */ public void setController(MediaController controller) { + mProvider.setController_impl(controller); } /** diff --git a/core/java/android/widget/VideoView2.java b/core/java/android/widget/VideoView2.java index 09ff337b491c..6f08dc22aff1 100644 --- a/core/java/android/widget/VideoView2.java +++ b/core/java/android/widget/VideoView2.java @@ -26,10 +26,8 @@ import android.media.DataSourceDesc; import android.media.MediaItem2; import android.media.MediaMetadata2; import android.media.MediaPlayer2; -import android.media.MediaPlayerBase; import android.media.SessionToken2; import android.media.session.MediaController; -import android.media.session.MediaSession; import android.media.session.PlaybackState; import android.media.update.ApiLoader; import android.media.update.VideoView2Provider; @@ -279,40 +277,6 @@ public class VideoView2 extends ViewGroupHelper<VideoView2Provider> { mProvider.setAudioAttributes_impl(attributes); } - // TODO: unhide this method when MediaPlayerInterface became unhidden. - /** - * Sets a remote player for handling playback of the selected route from MediaControlView2. - * If this is not called, MediaCotrolView2 will not show the route button. - * - * @param routeCategories the list of media control categories in - * {@link android.support.v7.media.MediaControlIntent} - * @param player the player to handle playback of the selected route. - * If null, a default route player will be used. - * @throws IllegalStateException if MediaControlView2 is not set. - * @hide - */ - public void setRouteAttributes(@NonNull List<String> routeCategories, - @Nullable MediaPlayerBase player) { - mProvider.setRouteAttributes_impl(routeCategories, player); - } - - /** - * Sets a remote player for handling playback of the selected route from MediaControlView2. - * If this is not called, MediaCotrolView2 will not show the route button. - * - * @param routeCategories the list of media control categories in - * {@link android.support.v7.media.MediaControlIntent} - * @param sessionPlayer the player to handle playback of the selected route. - * If null, a default route player will be used. - * @throws IllegalStateException if MediaControlView2 is not set. - * @hide - */ - // TODO: Use MediaPlayerBase once MediaSession2 APIs are ready. - public void setRouteAttributes(@NonNull List<String> routeCategories, - @Nullable MediaSession.Callback sessionPlayer) { - mProvider.setRouteAttributes_impl(routeCategories, sessionPlayer); - } - /** * Sets video path. * diff --git a/media/java/android/media/update/VideoView2Provider.java b/media/java/android/media/update/VideoView2Provider.java index 11b3560dc19f..27b436fd1b79 100644 --- a/media/java/android/media/update/VideoView2Provider.java +++ b/media/java/android/media/update/VideoView2Provider.java @@ -69,19 +69,6 @@ public interface VideoView2Provider extends ViewGroupProvider { void setSpeed_impl(float speed); void setAudioFocusRequest_impl(int focusGain); void setAudioAttributes_impl(AudioAttributes attributes); - /** - * @hide - */ - void setRouteAttributes_impl(List<String> routeCategories, MediaPlayerBase player); - /** - * @hide - */ - // TODO: remove setRouteAttributes_impl with MediaSession.Callback once MediaSession2 is ready. - void setRouteAttributes_impl(List<String> routeCategories, MediaSession.Callback sessionPlayer); - - /** - * @hide TODO: remove - */ void setVideoPath_impl(String path); /** * @hide TODO: remove |