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

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

Merge "ExifInterface: Remove dependency on Piex for DNG Test File"

parents 8ac54f16 a59d058e

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -20115,6 +20115,7 @@ package android.media { 
    method public java.lang.String getAttribute(java.lang.String);

    method public double getAttributeDouble(java.lang.String, double);

    method public int getAttributeInt(java.lang.String, int);

    method public long[] getAttributeLongArray(java.lang.String);

    method public boolean getLatLong(float[]);

    method public byte[] getThumbnail();

    method public long[] getThumbnailRange();
@@ -20211,6 +20212,7 @@ package android.media { 
    field public static final java.lang.String TAG_MAX_APERTURE_VALUE = "MaxApertureValue";

    field public static final java.lang.String TAG_METERING_MODE = "MeteringMode";

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

    field public static final java.lang.String TAG_NEW_SUBFILE_TYPE = "NewSubfileType";

    field public static final java.lang.String TAG_OECF = "OECF";

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

    field public static final java.lang.String TAG_PHOTOMETRIC_INTERPRETATION = "PhotometricInterpretation";
@@ -20234,6 +20236,7 @@ package android.media { 
    field public static final java.lang.String TAG_SPECTRAL_SENSITIVITY = "SpectralSensitivity";

    field public static final java.lang.String TAG_STRIP_BYTE_COUNTS = "StripByteCounts";

    field public static final java.lang.String TAG_STRIP_OFFSETS = "StripOffsets";

    field public static final java.lang.String TAG_SUBFILE_TYPE = "SubfileType";

    field public static final java.lang.String TAG_SUBJECT_AREA = "SubjectArea";

    field public static final java.lang.String TAG_SUBJECT_DISTANCE = "SubjectDistance";

    field public static final java.lang.String TAG_SUBJECT_DISTANCE_RANGE = "SubjectDistanceRange";

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -21635,6 +21635,7 @@ package android.media { 
    method public java.lang.String getAttribute(java.lang.String);

    method public double getAttributeDouble(java.lang.String, double);

    method public int getAttributeInt(java.lang.String, int);

    method public long[] getAttributeLongArray(java.lang.String);

    method public boolean getLatLong(float[]);

    method public byte[] getThumbnail();

    method public long[] getThumbnailRange();
@@ -21731,6 +21732,7 @@ package android.media { 
    field public static final java.lang.String TAG_MAX_APERTURE_VALUE = "MaxApertureValue";

    field public static final java.lang.String TAG_METERING_MODE = "MeteringMode";

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

    field public static final java.lang.String TAG_NEW_SUBFILE_TYPE = "NewSubfileType";

    field public static final java.lang.String TAG_OECF = "OECF";

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

    field public static final java.lang.String TAG_PHOTOMETRIC_INTERPRETATION = "PhotometricInterpretation";
@@ -21754,6 +21756,7 @@ package android.media { 
    field public static final java.lang.String TAG_SPECTRAL_SENSITIVITY = "SpectralSensitivity";

    field public static final java.lang.String TAG_STRIP_BYTE_COUNTS = "StripByteCounts";

    field public static final java.lang.String TAG_STRIP_OFFSETS = "StripOffsets";

    field public static final java.lang.String TAG_SUBFILE_TYPE = "SubfileType";

    field public static final java.lang.String TAG_SUBJECT_AREA = "SubjectArea";

    field public static final java.lang.String TAG_SUBJECT_DISTANCE = "SubjectDistance";

    field public static final java.lang.String TAG_SUBJECT_DISTANCE_RANGE = "SubjectDistanceRange";

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -20185,6 +20185,7 @@ package android.media { 
    method public java.lang.String getAttribute(java.lang.String);

    method public double getAttributeDouble(java.lang.String, double);

    method public int getAttributeInt(java.lang.String, int);

    method public long[] getAttributeLongArray(java.lang.String);

    method public boolean getLatLong(float[]);

    method public byte[] getThumbnail();

    method public long[] getThumbnailRange();
@@ -20281,6 +20282,7 @@ package android.media { 
    field public static final java.lang.String TAG_MAX_APERTURE_VALUE = "MaxApertureValue";

    field public static final java.lang.String TAG_METERING_MODE = "MeteringMode";

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

    field public static final java.lang.String TAG_NEW_SUBFILE_TYPE = "NewSubfileType";

    field public static final java.lang.String TAG_OECF = "OECF";

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

    field public static final java.lang.String TAG_PHOTOMETRIC_INTERPRETATION = "PhotometricInterpretation";
@@ -20304,6 +20306,7 @@ package android.media { 
    field public static final java.lang.String TAG_SPECTRAL_SENSITIVITY = "SpectralSensitivity";

    field public static final java.lang.String TAG_STRIP_BYTE_COUNTS = "StripByteCounts";

    field public static final java.lang.String TAG_STRIP_OFFSETS = "StripOffsets";

    field public static final java.lang.String TAG_SUBFILE_TYPE = "SubfileType";

    field public static final java.lang.String TAG_SUBJECT_AREA = "SubjectArea";

    field public static final java.lang.String TAG_SUBJECT_DISTANCE = "SubjectDistance";

    field public static final java.lang.String TAG_SUBJECT_DISTANCE_RANGE = "SubjectDistanceRange";

media/java/android/media/ExifInterface.java

+268 −120

File changed.

Preview size limit exceeded, changes collapsed.