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

Commit b18b4354 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Android (Google) Code Review
Browse files

Merge "Media: Adds TAG_THUMBNAIL_ORIENTATION to ExifInterface"

parents d6936287 081b1866

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -23977,6 +23977,7 @@ package android.media { 
    field public static final String TAG_SUBSEC_TIME_ORIGINAL = "SubSecTimeOriginal";

    field public static final String TAG_THUMBNAIL_IMAGE_LENGTH = "ThumbnailImageLength";

    field public static final String TAG_THUMBNAIL_IMAGE_WIDTH = "ThumbnailImageWidth";

    field public static final String TAG_THUMBNAIL_ORIENTATION = "ThumbnailOrientation";

    field public static final String TAG_TRANSFER_FUNCTION = "TransferFunction";

    field public static final String TAG_USER_COMMENT = "UserComment";

    field public static final String TAG_WHITE_BALANCE = "WhiteBalance";

media/java/android/media/ExifInterface.java

+3 −1
Original line number Diff line number Diff line
@@ -367,6 +367,8 @@ public class ExifInterface { 
    public static final String TAG_THUMBNAIL_IMAGE_LENGTH = "ThumbnailImageLength";

    /** Type is int. */

    public static final String TAG_THUMBNAIL_IMAGE_WIDTH = "ThumbnailImageWidth";

    /** Type is int. */

    public static final String TAG_THUMBNAIL_ORIENTATION = "ThumbnailOrientation";

    /** Type is int. DNG Specification 1.4.0.0. Section 4 */

    public static final String TAG_DNG_VERSION = "DNGVersion";

    /** Type is int. DNG Specification 1.4.0.0. Section 4 */
@@ -1155,7 +1157,7 @@ public class ExifInterface { 
            new ExifTag(TAG_MAKE, 271, IFD_FORMAT_STRING),

            new ExifTag(TAG_MODEL, 272, IFD_FORMAT_STRING),

            new ExifTag(TAG_STRIP_OFFSETS, 273, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),

            new ExifTag(TAG_ORIENTATION, 274, IFD_FORMAT_USHORT),

            new ExifTag(TAG_THUMBNAIL_ORIENTATION, 274, IFD_FORMAT_USHORT),

            new ExifTag(TAG_SAMPLES_PER_PIXEL, 277, IFD_FORMAT_USHORT),

            new ExifTag(TAG_ROWS_PER_STRIP, 278, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),

            new ExifTag(TAG_STRIP_BYTE_COUNTS, 279, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),