diff options
| author | James Dong <jdong@google.com> | 2011-11-11 11:48:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-11 11:48:27 -0800 |
| commit | 9a176507a96ceb3640a56a5449e96fc3e406a765 (patch) | |
| tree | 1ceed497531cee93e83e1ebce22575f37284f530 | |
| parent | 8a0654231ff36d938bc3451190cf67231195f1d0 (diff) | |
| parent | b7a000a6fb84ae75847e730332bae62ba1234999 (diff) | |
| download | frameworks_base-9a176507a96ceb3640a56a5449e96fc3e406a765.zip frameworks_base-9a176507a96ceb3640a56a5449e96fc3e406a765.tar.gz frameworks_base-9a176507a96ceb3640a56a5449e96fc3e406a765.tar.bz2 | |
am b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1
* commit 'b7a000a6fb84ae75847e730332bae62ba1234999':
Unhide the key to retriever location information in 3gp/mp4 files
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/MediaMetadataRetriever.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 3757ece..f33c6cb 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 diff --git a/media/java/android/media/MediaMetadataRetriever.java b/media/java/android/media/MediaMetadataRetriever.java index b17f297..11ecd1f 100644 --- a/media/java/android/media/MediaMetadataRetriever.java +++ b/media/java/android/media/MediaMetadataRetriever.java @@ -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... |