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

Commit 596e1d3b authored by Jaesung Chung's avatar Jaesung Chung Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "ExifInterface: switch from using jhead to java... 

Merge "Revert "Revert "ExifInterface: switch from using jhead to java implementation""" into nyc-dev
parents d48a25b8 15ef59e0

api/current.txt

+9 −0
Original line number Diff line number Diff line
@@ -20207,6 +20207,8 @@ package android.media { 














  public class ExifInterface {















    ctor public ExifInterface(java.lang.String) throws java.io.IOException;













    ctor public ExifInterface(java.io.FileDescriptor) throws java.io.IOException;













    ctor public ExifInterface(java.io.InputStream) throws java.io.IOException;















    method public double getAltitude(double);















    method public java.lang.String getAttribute(java.lang.String);















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









@@ -20228,6 +20230,10 @@ package android.media {













    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_DIGITAL_ZOOM_RATIO = "DigitalZoomRatio";













    field public static final java.lang.String TAG_EXPOSURE_BIAS_VALUE = "ExposureBiasValue";













    field public static final java.lang.String TAG_EXPOSURE_MODE = "ExposureMode";













    field public static final java.lang.String TAG_EXPOSURE_PROGRAM = "ExposureProgram";















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









@@ -20243,9 +20249,12 @@ package android.media {













    field public static final java.lang.String TAG_IMAGE_LENGTH = "ImageLength";















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















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













    field public static final java.lang.String TAG_LIGHT_SOURCE = "LightSource";















    field public static final java.lang.String TAG_MAKE = "Make";













    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_ORIENTATION = "Orientation";













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















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

























api/system-current.txt



+9
−0




























Original line number
Diff line number
Diff line








@@ -21715,6 +21715,8 @@ package android.media {



























  public class ExifInterface {















    ctor public ExifInterface(java.lang.String) throws java.io.IOException;













    ctor public ExifInterface(java.io.FileDescriptor) throws java.io.IOException;













    ctor public ExifInterface(java.io.InputStream) throws java.io.IOException;















    method public double getAltitude(double);















    method public java.lang.String getAttribute(java.lang.String);















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









@@ -21736,6 +21738,10 @@ package android.media {













    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_DIGITAL_ZOOM_RATIO = "DigitalZoomRatio";













    field public static final java.lang.String TAG_EXPOSURE_BIAS_VALUE = "ExposureBiasValue";













    field public static final java.lang.String TAG_EXPOSURE_MODE = "ExposureMode";













    field public static final java.lang.String TAG_EXPOSURE_PROGRAM = "ExposureProgram";















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









@@ -21751,9 +21757,12 @@ package android.media {













    field public static final java.lang.String TAG_IMAGE_LENGTH = "ImageLength";















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















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













    field public static final java.lang.String TAG_LIGHT_SOURCE = "LightSource";















    field public static final java.lang.String TAG_MAKE = "Make";













    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_ORIENTATION = "Orientation";













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















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

























api/test-current.txt



+9
−0




























Original line number
Diff line number
Diff line








@@ -20216,6 +20216,8 @@ package android.media {



























  public class ExifInterface {















    ctor public ExifInterface(java.lang.String) throws java.io.IOException;













    ctor public ExifInterface(java.io.FileDescriptor) throws java.io.IOException;













    ctor public ExifInterface(java.io.InputStream) throws java.io.IOException;















    method public double getAltitude(double);















    method public java.lang.String getAttribute(java.lang.String);















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









@@ -20237,6 +20239,10 @@ package android.media {













    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_DIGITAL_ZOOM_RATIO = "DigitalZoomRatio";













    field public static final java.lang.String TAG_EXPOSURE_BIAS_VALUE = "ExposureBiasValue";













    field public static final java.lang.String TAG_EXPOSURE_MODE = "ExposureMode";













    field public static final java.lang.String TAG_EXPOSURE_PROGRAM = "ExposureProgram";















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









@@ -20252,9 +20258,12 @@ package android.media {













    field public static final java.lang.String TAG_IMAGE_LENGTH = "ImageLength";















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















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













    field public static final java.lang.String TAG_LIGHT_SOURCE = "LightSource";















    field public static final java.lang.String TAG_MAKE = "Make";













    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_ORIENTATION = "Orientation";













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















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

























media/java/android/media/ExifInterface.java



+1587
−137


























File changed.
Preview size limit exceeded, changes collapsed.
























media/jni/Android.mk



+0
−4




























Original line number
Diff line number
Diff line








@@ -43,14 +43,10 @@ LOCAL_SHARED_LIBRARIES := \













    libcamera_client \















    libmtp \















    libusbhost \













    libjhead \















    libexif \















    libpiex \















    libstagefright_amrnb_common





























LOCAL_REQUIRED_MODULES := \













    libjhead_jni





























LOCAL_STATIC_LIBRARIES := \















    libstagefright_amrnbenc