Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b09aed7c authored by Jin Seok Park's avatar Jin Seok Park Committed by Android (Google) Code Review
Browse files

Merge "Unhide Offset-related tags"

parents 3c177c45 53b832e0

api/current.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -24153,6 +24153,9 @@ package android.media { 
    field public static final String TAG_MODEL = "Model";

    field public static final String TAG_MODEL = "Model";

    field public static final String TAG_NEW_SUBFILE_TYPE = "NewSubfileType";

    field public static final String TAG_NEW_SUBFILE_TYPE = "NewSubfileType";

    field public static final String TAG_OECF = "OECF";

    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_ASPECT_FRAME = "AspectFrame";

    field public static final String TAG_ORF_PREVIEW_IMAGE_LENGTH = "PreviewImageLength";

    field public static final String TAG_ORF_PREVIEW_IMAGE_LENGTH = "PreviewImageLength";

    field public static final String TAG_ORF_PREVIEW_IMAGE_START = "PreviewImageStart";

    field public static final String TAG_ORF_PREVIEW_IMAGE_START = "PreviewImageStart";

media/java/android/media/ExifInterface.java

+48 −3
Original line number Original line Diff line number Diff line
@@ -237,11 +237,56 @@ public class ExifInterface { 
    public static final String TAG_NEW_SUBFILE_TYPE = "NewSubfileType";

    public static final String TAG_NEW_SUBFILE_TYPE = "NewSubfileType";

    /** Type is String. */

    /** Type is String. */

    public static final String TAG_OECF = "OECF";

    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";

    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";

    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";

    public static final String TAG_OFFSET_TIME_DIGITIZED = "OffsetTimeDigitized";

    /** Type is int. */

    /** Type is int. */

    public static final String TAG_PIXEL_X_DIMENSION = "PixelXDimension";

    public static final String TAG_PIXEL_X_DIMENSION = "PixelXDimension";