From c889c307b05b9f4a66d09617ced4a20a00161e7e Mon Sep 17 00:00:00 2001 From: Jaewan Kim Date: Mon, 26 Mar 2018 14:13:37 +0900 Subject: [PATCH] MediaMetadata2: Remove radio constants Removeing radio constants until their names are finalized. Bug: 75500592 Test: Build Change-Id: I6f7a219c19dd24579a76c2064e9781ca53618c69 --- media/java/android/media/MediaMetadata2.java | 35 ++------------------ 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/media/java/android/media/MediaMetadata2.java b/media/java/android/media/MediaMetadata2.java index 1a15962cb958a..59dd8cb8ae582 100644 --- a/media/java/android/media/MediaMetadata2.java +++ b/media/java/android/media/MediaMetadata2.java @@ -356,28 +356,6 @@ public final class MediaMetadata2 { */ public static final String METADATA_KEY_MEDIA_URI = "android.media.metadata.MEDIA_URI"; - /** - * The metadata key for a {@link Float} typed value to retrieve the information about the - * radio frequency if this metadata represents radio content. - * - * @see Builder#putFloat(String, float) - * @see #getFloat(String) - */ - public static final String METADATA_KEY_RADIO_FREQUENCY = - "android.media.metadata.RADIO_FREQUENCY"; - - /** - * The metadata key for a {@link CharSequence} or {@link String} typed value to retrieve the - * information about the radio callsign if this metadata represents radio content. - * - * @see Builder#putText(String, CharSequence) - * @see Builder#putString(String, String) - * @see #getText(String) - * @see #getString(String) - */ - public static final String METADATA_KEY_RADIO_CALLSIGN = - "android.media.metadata.RADIO_CALLSIGN"; - /** * The metadata key for a {@link Long} typed value to retrieve the information about the * bluetooth folder type of the media specified in the section 6.10.2.2 of the Bluetooth @@ -502,7 +480,7 @@ public final class MediaMetadata2 { 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_DISPLAY_DESCRIPTION, METADATA_KEY_DISPLAY_ICON_URI, - METADATA_KEY_MEDIA_ID, METADATA_KEY_MEDIA_URI, METADATA_KEY_RADIO_CALLSIGN}) + METADATA_KEY_MEDIA_ID, METADATA_KEY_MEDIA_URI}) @Retention(RetentionPolicy.SOURCE) public @interface TextKey {} @@ -532,7 +510,7 @@ public final class MediaMetadata2 { /** * @hide */ - @StringDef({METADATA_KEY_RADIO_FREQUENCY}) + // TODO(jaewan): Add predefined float key. @Retention(RetentionPolicy.SOURCE) public @interface FloatKey {} @@ -741,7 +719,6 @@ public final class MediaMetadata2 { *
  • {@link #METADATA_KEY_DISPLAY_SUBTITLE}
    • *
  • {@link #METADATA_KEY_DISPLAY_DESCRIPTION}
    • *
  • {@link #METADATA_KEY_DISPLAY_ICON_URI}
    • - *
  • {@link #METADATA_KEY_RADIO_CALLSIGN}
    • * * * @param key The key for referencing this value @@ -773,7 +750,6 @@ public final class MediaMetadata2 { *
  • {@link #METADATA_KEY_DISPLAY_SUBTITLE}
    • *
  • {@link #METADATA_KEY_DISPLAY_DESCRIPTION}
    • *
  • {@link #METADATA_KEY_DISPLAY_ICON_URI}
    • - *
  • {@link #METADATA_KEY_RADIO_CALLSIGN}
    • * * * @param key The key for referencing this value @@ -848,12 +824,7 @@ public final class MediaMetadata2 { } /** - * Put a float value into the metadata. Custom keys may be used, but if - * the METADATA_KEYs defined in this class are used they may only be one - * of the following: - * + * Put a float value into the metadata. Custom keys may be used. * * @param key The key for referencing this value * @param value The float value to store