diff options
| author | 2019-01-29 00:49:37 +0000 | |
|---|---|---|
| committer | 2019-01-29 00:49:37 +0000 | |
| commit | 3b8e00f138a126311e374892008e38e5d97bcc1f (patch) | |
| tree | b2f401b2f205552f7920347f9a9f44b38adebaf9 | |
| parent | 7c7f18b9b1f8a8889e32ccdd52750b9fce4d1c6c (diff) | |
| parent | 245cb132c4bfda4cec27a828f5eb4fe24a4d3f27 (diff) | |
Merge "MetadataRetriever: Unhide Exif-related constants"
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | media/java/android/media/MediaMetadataRetriever.java | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 5b36f2334449..83b4bb1ffd8d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25157,6 +25157,8 @@ package android.media { field public static final int METADATA_KEY_DATE = 5; // 0x5 field public static final int METADATA_KEY_DISC_NUMBER = 14; // 0xe field public static final int METADATA_KEY_DURATION = 9; // 0x9 + field public static final int METADATA_KEY_EXIF_LENGTH = 34; // 0x22 + field public static final int METADATA_KEY_EXIF_OFFSET = 33; // 0x21 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_IMAGE = 26; // 0x1a diff --git a/media/java/android/media/MediaMetadataRetriever.java b/media/java/android/media/MediaMetadataRetriever.java index 33b8c4202fdd..112ce1dd1acc 100644 --- a/media/java/android/media/MediaMetadataRetriever.java +++ b/media/java/android/media/MediaMetadataRetriever.java @@ -920,12 +920,14 @@ public class MediaMetadataRetriever implements AutoCloseable { public static final int METADATA_KEY_VIDEO_FRAME_COUNT = 32; /** - * @hide + * If the media contains EXIF data, this key retrieves the offset value + * of the data. */ public static final int METADATA_KEY_EXIF_OFFSET = 33; /** - * @hide + * If the media contains EXIF data, this key retrieves the length of the + * data. */ public static final int METADATA_KEY_EXIF_LENGTH = 34; |