summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jin Seok Park <jinpark@google.com> 2019-11-06 11:46:46 +0900
committer Jin Seok Park <jinpark@google.com> 2019-11-13 10:23:19 +0900
commit53b832e0644ba6cd619a38b9d09ffe57be52c973 (patch)
tree7c28df5c24572534ddc8589445dbbc7f4fc77ed8
parent55a225ade4016b9dde04a3d4b4d25db761b1ccbf (diff)
Unhide Offset-related tags
Bug: 143487312 Test: make update-api Change-Id: I98db501883de3cf75b87781e8b9258aff4d177e0
-rw-r--r--api/current.txt3
-rw-r--r--media/java/android/media/ExifInterface.java51
2 files changed, 51 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt
index 6d2221e4e43c..2a290f8da1e0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -24125,6 +24125,9 @@ package android.media {
field public static final String TAG_MODEL = "Model";
field public static final String TAG_NEW_SUBFILE_TYPE = "NewSubfileType";
field public static final String TAG_OECF = "OECF";
+ field public static final String TAG_OFFSET_TIME = "OffsetTime";
+ field public static final String TAG_OFFSET_TIME_DIGITIZED = "OffsetTimeDigitized";
+ field public static final String TAG_OFFSET_TIME_ORIGINAL = "OffsetTimeOriginal";
field public static final String TAG_ORF_ASPECT_FRAME = "AspectFrame";
field public static final String TAG_ORF_PREVIEW_IMAGE_LENGTH = "PreviewImageLength";
field public static final String TAG_ORF_PREVIEW_IMAGE_START = "PreviewImageStart";
diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index 33ddfa7849e1..53749d8bcba4 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -235,11 +235,56 @@ public class ExifInterface {
public static final String TAG_NEW_SUBFILE_TYPE = "NewSubfileType";
/** Type is String. */
public static final String TAG_OECF = "OECF";
- /** Type is String. {@hide} */
+ /**
+ * <p>A tag used to record the offset from UTC (the time difference from Universal Time
+ * Coordinated including daylight saving time) of the time of DateTime tag. The format when
+ * recording the offset is "±HH:MM". The part of "±" shall be recorded as "+" or "-". When
+ * the offsets are unknown, all the character spaces except colons (":") should be filled
+ * with blank characters, or else the Interoperability field should be filled with blank
+ * characters. The character string length is 7 Bytes including NULL for termination. When
+ * the field is left blank, it is treated as unknown.</p>
+ *
+ * <ul>
+ * <li>Tag = 36880</li>
+ * <li>Type = String</li>
+ * <li>Length = 7</li>
+ * <li>Default = None</li>
+ * </ul>
+ */
public static final String TAG_OFFSET_TIME = "OffsetTime";
- /** Type is String. {@hide} */
+ /**
+ * <p>A tag used to record the offset from UTC (the time difference from Universal Time
+ * Coordinated including daylight saving time) of the time of DateTimeOriginal tag. The format
+ * when recording the offset is "±HH:MM". The part of "±" shall be recorded as "+" or "-". When
+ * the offsets are unknown, all the character spaces except colons (":") should be filled
+ * with blank characters, or else the Interoperability field should be filled with blank
+ * characters. The character string length is 7 Bytes including NULL for termination. When
+ * the field is left blank, it is treated as unknown.</p>
+ *
+ * <ul>
+ * <li>Tag = 36881</li>
+ * <li>Type = String</li>
+ * <li>Length = 7</li>
+ * <li>Default = None</li>
+ * </ul>
+ */
public static final String TAG_OFFSET_TIME_ORIGINAL = "OffsetTimeOriginal";
- /** Type is String. {@hide} */
+ /**
+ * <p>A tag used to record the offset from UTC (the time difference from Universal Time
+ * Coordinated including daylight saving time) of the time of DateTimeDigitized tag. The format
+ * when recording the offset is "±HH:MM". The part of "±" shall be recorded as "+" or "-". When
+ * the offsets are unknown, all the character spaces except colons (":") should be filled
+ * with blank characters, or else the Interoperability field should be filled with blank
+ * characters. The character string length is 7 Bytes including NULL for termination. When
+ * the field is left blank, it is treated as unknown.</p>
+ *
+ * <ul>
+ * <li>Tag = 36882</li>
+ * <li>Type = String</li>
+ * <li>Length = 7</li>
+ * <li>Default = None</li>
+ * </ul>
+ */
public static final String TAG_OFFSET_TIME_DIGITIZED = "OffsetTimeDigitized";
/** Type is int. */
public static final String TAG_PIXEL_X_DIMENSION = "PixelXDimension";