| commit | 47879540483bdcf58164346db3b2194cb7899515 | [log] [tgz] |
|---|---|---|
| author | Tomasz Wasilczyk <[email protected]> | Tue May 22 21:20:59 2018 +0000 |
| committer | Android (Google) Code Review <[email protected]> | Tue May 22 21:20:59 2018 +0000 |
| tree | dc0e2c2728b91d3f5701d888120794526fc81476 | |
| parent | d2fb166dae1ace54b5820ea7ec8c70aec14cfd72 [diff] | |
| parent | 049d3d3231757b863fbb6ed92ee5cf479b60bd5e [diff] |
Merge "Tag band root nodes with EXTRA_BCRADIO_BAND_NAME_EN." into pi-dev
diff --git a/car-media-common/src/com/android/car/media/common/MediaSource.java b/car-media-common/src/com/android/car/media/common/MediaSource.java index 78bbd64..fe393e7 100644 --- a/car-media-common/src/com/android/car/media/common/MediaSource.java +++ b/car-media-common/src/com/android/car/media/common/MediaSource.java
@@ -92,9 +92,6 @@ * Custom media sources which should not be templatized. */ private static final Set<String> CUSTOM_MEDIA_SOURCES = new HashSet<>(); - static { - CUSTOM_MEDIA_SOURCES.add("com.android.car.radio"); - } /** * An observer of this media source.
diff --git a/car-media-common/src/com/android/car/media/common/PlaybackModel.java b/car-media-common/src/com/android/car/media/common/PlaybackModel.java index c472911..6206afe 100644 --- a/car-media-common/src/com/android/car/media/common/PlaybackModel.java +++ b/car-media-common/src/com/android/car/media/common/PlaybackModel.java
@@ -320,6 +320,15 @@ } /** + * Prepares the current media source for playback. + */ + public void onPrepare() { + if (mMediaController != null) { + mMediaController.getTransportControls().prepare(); + } + } + + /** * Possible main actions. */ @IntDef({ACTION_PLAY, ACTION_STOP, ACTION_PAUSE, ACTION_DISABLED})