| commit | ee50181163bfc0e281206c8ae3493e129502fed2 | [log] [tgz] |
|---|---|---|
| author | Yabin Huang <[email protected]> | Tue Oct 01 01:00:30 2019 +0000 |
| committer | Android (Google) Code Review <[email protected]> | Tue Oct 01 01:00:30 2019 +0000 |
| tree | 7fa583aa0f6a901f836c160e6798897ce7d93609 | |
| parent | 00d0eb42d912d55d9740853cca3995b11bb6c46d [diff] | |
| parent | 593636814f179b9b6dec0baed689a0294345bfdc [diff] |
Merge "Pass extras to playFromMediaId" into pi-car-dev
diff --git a/car-media-common/src/com/android/car/media/common/MediaItemMetadata.java b/car-media-common/src/com/android/car/media/common/MediaItemMetadata.java index 5ca60d1..00a4416 100644 --- a/car-media-common/src/com/android/car/media/common/MediaItemMetadata.java +++ b/car-media-common/src/com/android/car/media/common/MediaItemMetadata.java
@@ -236,6 +236,13 @@ } /** + * @return optional extras that can include extra information about the media item to be played. + */ + public Bundle getExtras() { + return mMediaDescription.getExtras(); + } + + /** * @return boolean that indicate if media is explicit. */ public boolean isExplicit() {
diff --git a/car-media-common/src/com/android/car/media/common/playback/PlaybackViewModel.java b/car-media-common/src/com/android/car/media/common/playback/PlaybackViewModel.java index e085c00..e4ed555 100644 --- a/car-media-common/src/com/android/car/media/common/playback/PlaybackViewModel.java +++ b/car-media-common/src/com/android/car/media/common/playback/PlaybackViewModel.java
@@ -598,12 +598,12 @@ } /** - * Starts playing a given media item. This id corresponds to {@link - * MediaItemMetadata#getId()}. + * Starts playing a given media item. */ - public void playItem(String mediaItemId) { + public void playItem(MediaItemMetadata item) { if (mMediaController != null) { - mMediaController.getTransportControls().playFromMediaId(mediaItemId, null); + mMediaController.getTransportControls().playFromMediaId(item.getId(), + item.getExtras()); } }