summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-11-11 10:49:24 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-11 10:49:24 -0800
commitb7a000a6fb84ae75847e730332bae62ba1234999 (patch)
tree1ceed497531cee93e83e1ebce22575f37284f530 /media
parent23217182743521063655c6fb1b1580d3558cfbe7 (diff)
parent00aa51b355d2b9ae7604fe4c43f6e64193422dba (diff)
downloadframeworks_base-b7a000a6fb84ae75847e730332bae62ba1234999.zip
frameworks_base-b7a000a6fb84ae75847e730332bae62ba1234999.tar.gz
frameworks_base-b7a000a6fb84ae75847e730332bae62ba1234999.tar.bz2
Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaMetadataRetriever.java1
1 files changed, 0 insertions, 1 deletions
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...