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

Commit b7a000a6 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1

parents 23217182 00aa51b3

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10696,6 +10696,7 @@ package android.media { 
    field public static final int METADATA_KEY_GENRE = 6; // 0x6

    field public static final int METADATA_KEY_HAS_AUDIO = 16; // 0x10

    field public static final int METADATA_KEY_HAS_VIDEO = 17; // 0x11

    field public static final int METADATA_KEY_LOCATION = 23; // 0x17

    field public static final int METADATA_KEY_MIMETYPE = 12; // 0xc

    field public static final int METADATA_KEY_NUM_TRACKS = 10; // 0xa

    field public static final int METADATA_KEY_TITLE = 7; // 0x7

media/java/android/media/MediaMetadataRetriever.java

+0 −1
Original line number Diff line number Diff line
@@ -463,7 +463,6 @@ public class MediaMetadataRetriever 
     * The location should be specified according to ISO-6709 standard, under

     * a mp4/3gp box "@xyz". Location with longitude of -90 degrees and latitude

     * of 180 degrees will be retrieved as "-90.0000+180.0000", for instance.

     * @hide

     */

    public static final int METADATA_KEY_LOCATION        = 23;

    // Add more here...