Remove unnecessary ternary operator from ExifInterface constructor
Removes unnecessary private constructor to remove usage of ternary
operator in constructor.
This works around an issue that Jacoco has with instrumenting
constructors with ternary operators inside a this() or super()
statement (b/26641175)
Bug: 162018163
Test: ./gradlew test -Pandroidx.coverageEnabled=true
Change-Id: I921a233ba43fdd260e4bb9728395c8a799c2c4a5
diff --git a/exifinterface/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterface.java b/exifinterface/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterface.java
index ce39ae7..ec9ce09 100644
--- a/exifinterface/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterface.java
+++ b/exifinterface/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterface.java
@@ -3977,7 +3977,7 @@
* @throws NullPointerException if the input stream is null
*/
public ExifInterface(@NonNull InputStream inputStream) throws IOException {
- this(inputStream, false);
+ this(inputStream, STREAM_TYPE_FULL_IMAGE_DATA);
}
/**
@@ -3994,16 +3994,12 @@
*/
public ExifInterface(@NonNull InputStream inputStream, @ExifStreamType int streamType)
throws IOException {
- this(inputStream, (streamType == STREAM_TYPE_EXIF_DATA_ONLY) ? true : false);
- }
-
- private ExifInterface(@NonNull InputStream inputStream, boolean shouldBeExifDataOnly)
- throws IOException {
if (inputStream == null) {
throw new NullPointerException("inputStream cannot be null");
}
mFilename = null;
+ boolean shouldBeExifDataOnly = (streamType == STREAM_TYPE_EXIF_DATA_ONLY);
if (shouldBeExifDataOnly) {
inputStream = new BufferedInputStream(inputStream, SIGNATURE_CHECK_SIZE);
if (!isExifDataOnly((BufferedInputStream) inputStream)) {
