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

Commit 98a5299b authored by Jaesung Chung's avatar Jaesung Chung Committed by android-build-merger
Browse files

Merge "ExifInterface: deprecate duplicated tags" into nyc-dev am: d37577d1 

am: 61f6904e

* commit '61f6904e':
  ExifInterface: deprecate duplicated tags

Change-Id: I9916bf18684821d903c999ba698cb5b6cd99e7a3
parents 20294bd3 61f6904e

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -20099,7 +20099,7 @@ package android.media { 
    field public static final int ORIENTATION_TRANSPOSE = 5; // 0x5

    field public static final int ORIENTATION_TRANSVERSE = 7; // 0x7

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

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

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

    field public static final java.lang.String TAG_APERTURE_VALUE = "ApertureValue";

    field public static final java.lang.String TAG_ARTIST = "Artist";

    field public static final java.lang.String TAG_BITS_PER_SAMPLE = "BitsPerSample";
@@ -20170,7 +20170,7 @@ package android.media { 
    field public static final java.lang.String TAG_IMAGE_UNIQUE_ID = "ImageUniqueID";

    field public static final java.lang.String TAG_IMAGE_WIDTH = "ImageWidth";

    field public static final java.lang.String TAG_INTEROPERABILITY_INDEX = "InteroperabilityIndex";

    field public static final java.lang.String TAG_ISO = "ISOSpeedRatings";

    field public static final deprecated java.lang.String TAG_ISO = "ISOSpeedRatings";

    field public static final java.lang.String TAG_ISO_SPEED_RATINGS = "ISOSpeedRatings";

    field public static final java.lang.String TAG_JPEG_INTERCHANGE_FORMAT = "JPEGInterchangeFormat";

    field public static final java.lang.String TAG_JPEG_INTERCHANGE_FORMAT_LENGTH = "JPEGInterchangeFormatLength";

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -21591,7 +21591,7 @@ package android.media { 
    field public static final int ORIENTATION_TRANSPOSE = 5; // 0x5

    field public static final int ORIENTATION_TRANSVERSE = 7; // 0x7

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

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

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

    field public static final java.lang.String TAG_APERTURE_VALUE = "ApertureValue";

    field public static final java.lang.String TAG_ARTIST = "Artist";

    field public static final java.lang.String TAG_BITS_PER_SAMPLE = "BitsPerSample";
@@ -21662,7 +21662,7 @@ package android.media { 
    field public static final java.lang.String TAG_IMAGE_UNIQUE_ID = "ImageUniqueID";

    field public static final java.lang.String TAG_IMAGE_WIDTH = "ImageWidth";

    field public static final java.lang.String TAG_INTEROPERABILITY_INDEX = "InteroperabilityIndex";

    field public static final java.lang.String TAG_ISO = "ISOSpeedRatings";

    field public static final deprecated java.lang.String TAG_ISO = "ISOSpeedRatings";

    field public static final java.lang.String TAG_ISO_SPEED_RATINGS = "ISOSpeedRatings";

    field public static final java.lang.String TAG_JPEG_INTERCHANGE_FORMAT = "JPEGInterchangeFormat";

    field public static final java.lang.String TAG_JPEG_INTERCHANGE_FORMAT_LENGTH = "JPEGInterchangeFormatLength";

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -20164,7 +20164,7 @@ package android.media { 
    field public static final int ORIENTATION_TRANSPOSE = 5; // 0x5

    field public static final int ORIENTATION_TRANSVERSE = 7; // 0x7

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

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

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

    field public static final java.lang.String TAG_APERTURE_VALUE = "ApertureValue";

    field public static final java.lang.String TAG_ARTIST = "Artist";

    field public static final java.lang.String TAG_BITS_PER_SAMPLE = "BitsPerSample";
@@ -20235,7 +20235,7 @@ package android.media { 
    field public static final java.lang.String TAG_IMAGE_UNIQUE_ID = "ImageUniqueID";

    field public static final java.lang.String TAG_IMAGE_WIDTH = "ImageWidth";

    field public static final java.lang.String TAG_INTEROPERABILITY_INDEX = "InteroperabilityIndex";

    field public static final java.lang.String TAG_ISO = "ISOSpeedRatings";

    field public static final deprecated java.lang.String TAG_ISO = "ISOSpeedRatings";

    field public static final java.lang.String TAG_ISO_SPEED_RATINGS = "ISOSpeedRatings";

    field public static final java.lang.String TAG_JPEG_INTERCHANGE_FORMAT = "JPEGInterchangeFormat";

    field public static final java.lang.String TAG_JPEG_INTERCHANGE_FORMAT_LENGTH = "JPEGInterchangeFormatLength";

media/java/android/media/ExifInterface.java

+14 −4
Original line number Diff line number Diff line
@@ -161,9 +161,14 @@ public class ExifInterface { 
    public static final String TAG_EXPOSURE_PROGRAM = "ExposureProgram";

    /** Type is double. */

    public static final String TAG_EXPOSURE_TIME = "ExposureTime";

    /** Type is String. */

    /** Type is double. */

    public static final String TAG_F_NUMBER = "FNumber";

    /** Type is String. */

    /**

     * Type is double.

     *

     * @deprecated use {@link #TAG_F_NUMBER} instead

     */

    @Deprecated

    public static final String TAG_APERTURE = "FNumber";

    /** Type is String. */

    public static final String TAG_FILE_SOURCE = "FileSource";
@@ -185,9 +190,14 @@ public class ExifInterface { 
    public static final String TAG_FOCAL_PLANE_Y_RESOLUTION = "FocalPlaneYResolution";

    /** Type is rational. */

    public static final String TAG_GAIN_CONTROL = "GainControl";

    /** Type is String. */

    /** Type is int. */

    public static final String TAG_ISO_SPEED_RATINGS = "ISOSpeedRatings";

    /** Type is String. */

    /**

     * Type is int.

     *

     * @deprecated use {@link #TAG_ISO_SPEED_RATINGS} instead

     */

    @Deprecated

    public static final String TAG_ISO = "ISOSpeedRatings";

    /** Type is String. */

    public static final String TAG_IMAGE_UNIQUE_ID = "ImageUniqueID";