Switch to the support library version of ExifInterface

Fixes #3851. PiperOrigin-RevId: 278655542
bumptech · Nov 5, 2019 · bd6f894 · bd6f894 · kangshifu · Jan 2, 2020
1 parent d40198e
commit bd6f894
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -14,6 +14,7 @@ dependencies {
     api project(':annotation')
     api "androidx.fragment:fragment:${ANDROID_X_VERSION}"
     api "androidx.vectordrawable:vectordrawable-animated:${ANDROID_X_VERSION}"
+    api "androidx.exifinterface:exifinterface:${ANDROID_X_VERSION}"
     compileOnly "androidx.appcompat:appcompat:${ANDROID_X_VERSION}"
 
     if (project.plugins.hasPlugin('net.ltgt.errorprone')) {

diff --git a/...src/main/java/com/bumptech/glide/load/resource/bitmap/ExifInterfaceImageHeaderParser.java b/...src/main/java/com/bumptech/glide/load/resource/bitmap/ExifInterfaceImageHeaderParser.java
@@ -1,9 +1,9 @@
 package com.bumptech.glide.load.resource.bitmap;
 
-import android.media.ExifInterface;
 import android.os.Build;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
+import androidx.exifinterface.media.ExifInterface;
 import com.bumptech.glide.load.ImageHeaderParser;
 import com.bumptech.glide.load.engine.bitmap_recycle.ArrayPool;
 import com.bumptech.glide.util.ByteBufferUtil;
@@ -24,13 +24,13 @@ public final class ExifInterfaceImageHeaderParser implements ImageHeaderParser {
 
   @NonNull
   @Override
-  public ImageType getType(@NonNull InputStream is) throws IOException {
+  public ImageType getType(@NonNull InputStream is) {
     return ImageType.UNKNOWN;
   }
 
   @NonNull
   @Override
-  public ImageType getType(@NonNull ByteBuffer byteBuffer) throws IOException {
+  public ImageType getType(@NonNull ByteBuffer byteBuffer) {
     return ImageType.UNKNOWN;
   }