Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f2ada42 authored by RoboErik's avatar RoboErik Committed by Android Git Automerger
Browse files

am 027ffc1f: Merge "Change URI type metadata back to text" into lmp-dev 

* commit '027ffc1ff48b14aac43e895d221b42953883cb98':
  Change URI type metadata back to text
parents e20dd9f1 98cb95a9

media/java/android/media/MediaMetadata.java

+3 −4
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ public final class MediaMetadata implements Parcelable { 
    private static final int METADATA_TYPE_TEXT = 1;

    private static final int METADATA_TYPE_BITMAP = 2;

    private static final int METADATA_TYPE_RATING = 3;

    private static final int METADATA_TYPE_URI = 4;

    private static final ArrayMap<String, Integer> METADATA_KEYS_TYPE;



    static {
@@ -236,16 +235,16 @@ public final class MediaMetadata implements Parcelable { 
        METADATA_KEYS_TYPE.put(METADATA_KEY_DISC_NUMBER, METADATA_TYPE_LONG);

        METADATA_KEYS_TYPE.put(METADATA_KEY_ALBUM_ARTIST, METADATA_TYPE_TEXT);

        METADATA_KEYS_TYPE.put(METADATA_KEY_ART, METADATA_TYPE_BITMAP);

        METADATA_KEYS_TYPE.put(METADATA_KEY_ART_URI, METADATA_TYPE_URI);

        METADATA_KEYS_TYPE.put(METADATA_KEY_ART_URI, METADATA_TYPE_TEXT);

        METADATA_KEYS_TYPE.put(METADATA_KEY_ALBUM_ART, METADATA_TYPE_BITMAP);

        METADATA_KEYS_TYPE.put(METADATA_KEY_ALBUM_ART_URI, METADATA_TYPE_URI);

        METADATA_KEYS_TYPE.put(METADATA_KEY_ALBUM_ART_URI, METADATA_TYPE_TEXT);

        METADATA_KEYS_TYPE.put(METADATA_KEY_USER_RATING, METADATA_TYPE_RATING);

        METADATA_KEYS_TYPE.put(METADATA_KEY_RATING, METADATA_TYPE_RATING);

        METADATA_KEYS_TYPE.put(METADATA_KEY_DISPLAY_TITLE, METADATA_TYPE_TEXT);

        METADATA_KEYS_TYPE.put(METADATA_KEY_DISPLAY_SUBTITLE, METADATA_TYPE_TEXT);

        METADATA_KEYS_TYPE.put(METADATA_KEY_DISPLAY_DESCRIPTION, METADATA_TYPE_TEXT);

        METADATA_KEYS_TYPE.put(METADATA_KEY_DISPLAY_ICON, METADATA_TYPE_BITMAP);

        METADATA_KEYS_TYPE.put(METADATA_KEY_DISPLAY_ICON_URI, METADATA_TYPE_URI);

        METADATA_KEYS_TYPE.put(METADATA_KEY_DISPLAY_ICON_URI, METADATA_TYPE_TEXT);

    }



    private static final SparseArray<String> EDITOR_KEY_MAPPING;