Replace private constants
Currently, ExifInterface uses private constants for constants
added in Q. This CL replaces the constants to use the public
constants in MediaMetadataRetriever.
Bug: 124409340
Test: ./gradlew :exifinterface:checkConnected
Change-Id: I96c3cb961a8edb7e0c99ffb2e514aec088deb2dc
diff --git a/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterface.java b/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterface.java
index 2d540d5..99c1751 100644
--- a/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterface.java
+++ b/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterface.java
@@ -2850,10 +2850,6 @@
*/
public static final int REDUCED_RESOLUTION_IMAGE = 1;
- // TODO: Replace the following constants once Q is released. (b/124409340)
- private static final int METADATA_KEY_EXIF_OFFSET = 33;
- private static final int METADATA_KEY_EXIF_LENGTH = 34;
-
// Maximum size for checking file type signature (see image_type_recognition_lite.cc)
private static final int SIGNATURE_CHECK_SIZE = 5000;
@@ -5440,9 +5436,9 @@
}
String exifOffsetStr = retriever.extractMetadata(
- METADATA_KEY_EXIF_OFFSET);
+ MediaMetadataRetriever.METADATA_KEY_EXIF_OFFSET);
String exifLengthStr = retriever.extractMetadata(
- METADATA_KEY_EXIF_LENGTH);
+ MediaMetadataRetriever.METADATA_KEY_EXIF_LENGTH);
String hasImage = retriever.extractMetadata(
MediaMetadataRetriever.METADATA_KEY_HAS_IMAGE);
String hasVideo = retriever.extractMetadata(
