Merge "MediaMetadata: Add METADATA_KEY_MEDIA_URI" (49663cff) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaMetadata.java

+20 −1

Original line number	Original line	Diff line number	Diff line
	@@ -49,7 +49,7 @@ public final class MediaMetadata implements Parcelable {
	METADATA_KEY_DATE, METADATA_KEY_GENRE, METADATA_KEY_ALBUM_ARTIST, METADATA_KEY_ART_URI,		METADATA_KEY_DATE, METADATA_KEY_GENRE, METADATA_KEY_ALBUM_ARTIST, METADATA_KEY_ART_URI,
	METADATA_KEY_ALBUM_ART_URI, METADATA_KEY_DISPLAY_TITLE, METADATA_KEY_DISPLAY_SUBTITLE,		METADATA_KEY_ALBUM_ART_URI, METADATA_KEY_DISPLAY_TITLE, METADATA_KEY_DISPLAY_SUBTITLE,
	METADATA_KEY_DISPLAY_DESCRIPTION, METADATA_KEY_DISPLAY_ICON_URI,		METADATA_KEY_DISPLAY_DESCRIPTION, METADATA_KEY_DISPLAY_ICON_URI,
	METADATA_KEY_MEDIA_ID})		METADATA_KEY_MEDIA_ID, METADATA_KEY_MEDIA_URI})
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	public @interface TextKey {}		public @interface TextKey {}

	@@ -269,6 +269,16 @@ public final class MediaMetadata implements Parcelable {
	*/		*/
	public static final String METADATA_KEY_MEDIA_ID = "android.media.metadata.MEDIA_ID";		public static final String METADATA_KEY_MEDIA_ID = "android.media.metadata.MEDIA_ID";

			/**
			* A Uri formatted String representing the content. This value is specific to the
			* service providing the content. It may be used with
			* {@link MediaController.TransportControls#playFromUri(Uri, Bundle)}
			* to initiate playback when provided by a {@link MediaBrowser} connected to
			* the same app.
			* @hide
			*/
			public static final String METADATA_KEY_MEDIA_URI = "android.media.metadata.MEDIA_URI";

	/**		/**
	* The bluetooth folder type of the media specified in the section 6.10.2.2 of the Bluetooth		* The bluetooth folder type of the media specified in the section 6.10.2.2 of the Bluetooth
	* AVRCP 1.5. It should be one of the following:		* AVRCP 1.5. It should be one of the following:
	@@ -343,6 +353,8 @@ public final class MediaMetadata implements Parcelable {
	METADATA_KEYS_TYPE.put(METADATA_KEY_DISPLAY_ICON, METADATA_TYPE_BITMAP);		METADATA_KEYS_TYPE.put(METADATA_KEY_DISPLAY_ICON, METADATA_TYPE_BITMAP);
	METADATA_KEYS_TYPE.put(METADATA_KEY_DISPLAY_ICON_URI, METADATA_TYPE_TEXT);		METADATA_KEYS_TYPE.put(METADATA_KEY_DISPLAY_ICON_URI, METADATA_TYPE_TEXT);
	METADATA_KEYS_TYPE.put(METADATA_KEY_BT_FOLDER_TYPE, METADATA_TYPE_LONG);		METADATA_KEYS_TYPE.put(METADATA_KEY_BT_FOLDER_TYPE, METADATA_TYPE_LONG);
			METADATA_KEYS_TYPE.put(METADATA_KEY_MEDIA_ID, METADATA_TYPE_TEXT);
			METADATA_KEYS_TYPE.put(METADATA_KEY_MEDIA_URI, METADATA_TYPE_TEXT);
	}		}

	private static final SparseArray<String> EDITOR_KEY_MAPPING;		private static final SparseArray<String> EDITOR_KEY_MAPPING;
	@@ -554,6 +566,12 @@ public final class MediaMetadata implements Parcelable {
	}		}
	}		}

			Uri mediaUri = null;
			String mediaUriStr = getString(METADATA_KEY_MEDIA_URI);
			if (!TextUtils.isEmpty(mediaUriStr)) {
			mediaUri = Uri.parse(mediaUriStr);
			}

	MediaDescription.Builder bob = new MediaDescription.Builder();		MediaDescription.Builder bob = new MediaDescription.Builder();
	bob.setMediaId(mediaId);		bob.setMediaId(mediaId);
	bob.setTitle(text[0]);		bob.setTitle(text[0]);
	@@ -561,6 +579,7 @@ public final class MediaMetadata implements Parcelable {
	bob.setDescription(text[2]);		bob.setDescription(text[2]);
	bob.setIconBitmap(icon);		bob.setIconBitmap(icon);
	bob.setIconUri(iconUri);		bob.setIconUri(iconUri);
			bob.setMediaUri(mediaUri);
	if (mBundle.containsKey(METADATA_KEY_BT_FOLDER_TYPE)) {		if (mBundle.containsKey(METADATA_KEY_BT_FOLDER_TYPE)) {
	Bundle bundle = new Bundle();		Bundle bundle = new Bundle();
	bundle.putLong(MediaDescription.EXTRA_BT_FOLDER_TYPE,		bundle.putLong(MediaDescription.EXTRA_BT_FOLDER_TYPE,