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

Commit 7b7e1f97 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "ExifInterface: Add a few tag fields." into mnc-dev

parents 2c936af8 ab60e7e6

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -15242,6 +15242,7 @@ package android.media { 
    field public static final int ORIENTATION_UNDEFINED = 0; // 0x0

    field public static final java.lang.String TAG_APERTURE = "FNumber";

    field public static final java.lang.String TAG_DATETIME = "DateTime";

    field public static final java.lang.String TAG_DATETIME_DIGITIZED = "DateTimeDigitized";

    field public static final java.lang.String TAG_EXPOSURE_TIME = "ExposureTime";

    field public static final java.lang.String TAG_FLASH = "Flash";

    field public static final java.lang.String TAG_FOCAL_LENGTH = "FocalLength";
@@ -15260,6 +15261,9 @@ package android.media { 
    field public static final java.lang.String TAG_MAKE = "Make";

    field public static final java.lang.String TAG_MODEL = "Model";

    field public static final java.lang.String TAG_ORIENTATION = "Orientation";

    field public static final java.lang.String TAG_SUBSEC_TIME = "SubSecTime";

    field public static final java.lang.String TAG_SUBSEC_TIME_DIG = "SubSecTimeDigitized";

    field public static final java.lang.String TAG_SUBSEC_TIME_ORIG = "SubSecTimeOriginal";

    field public static final java.lang.String TAG_WHITE_BALANCE = "WhiteBalance";

    field public static final int WHITEBALANCE_AUTO = 0; // 0x0

    field public static final int WHITEBALANCE_MANUAL = 1; // 0x1

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -16483,6 +16483,7 @@ package android.media { 
    field public static final int ORIENTATION_UNDEFINED = 0; // 0x0

    field public static final java.lang.String TAG_APERTURE = "FNumber";

    field public static final java.lang.String TAG_DATETIME = "DateTime";

    field public static final java.lang.String TAG_DATETIME_DIGITIZED = "DateTimeDigitized";

    field public static final java.lang.String TAG_EXPOSURE_TIME = "ExposureTime";

    field public static final java.lang.String TAG_FLASH = "Flash";

    field public static final java.lang.String TAG_FOCAL_LENGTH = "FocalLength";
@@ -16501,6 +16502,9 @@ package android.media { 
    field public static final java.lang.String TAG_MAKE = "Make";

    field public static final java.lang.String TAG_MODEL = "Model";

    field public static final java.lang.String TAG_ORIENTATION = "Orientation";

    field public static final java.lang.String TAG_SUBSEC_TIME = "SubSecTime";

    field public static final java.lang.String TAG_SUBSEC_TIME_DIG = "SubSecTimeDigitized";

    field public static final java.lang.String TAG_SUBSEC_TIME_ORIG = "SubSecTimeOriginal";

    field public static final java.lang.String TAG_WHITE_BALANCE = "WhiteBalance";

    field public static final int WHITEBALANCE_AUTO = 0; // 0x0

    field public static final int WHITEBALANCE_MANUAL = 1; // 0x1

media/java/android/media/ExifInterface.java

+10 −0
Original line number Diff line number Diff line
@@ -57,6 +57,16 @@ public class ExifInterface { 
    public static final String TAG_APERTURE = "FNumber";

    /** Type is String. */

    public static final String TAG_ISO = "ISOSpeedRatings";

    /** Type is String. */

    public static final String TAG_DATETIME_DIGITIZED = "DateTimeDigitized";

    /** Type is int. */

    public static final String TAG_SUBSEC_TIME = "SubSecTime";

    /** Type is int. */

    public static final String TAG_SUBSEC_TIME_ORIG = "SubSecTimeOriginal";

    /** Type is int. */

    public static final String TAG_SUBSEC_TIME_DIG = "SubSecTimeDigitized";







    /**

     * @hide