summaryrefslogtreecommitdiffstats
path: root/api
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 /api
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 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 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