From 57882c288dd9f3f2ed21b74179a2ef8167ac717f Mon Sep 17 00:00:00 2001 From: bromano Date: Wed, 24 Apr 2024 02:45:19 -0700 Subject: [PATCH] Revert "Ensure backwards compat" This reverts commit 4f97f1d4822092ec287eb55435643ed259998c3a. --- .../glide/load/model/ResourceLoader.java | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/library/src/main/java/com/bumptech/glide/load/model/ResourceLoader.java b/library/src/main/java/com/bumptech/glide/load/model/ResourceLoader.java index ed620b6a5e..ad48104ba6 100644 --- a/library/src/main/java/com/bumptech/glide/load/model/ResourceLoader.java +++ b/library/src/main/java/com/bumptech/glide/load/model/ResourceLoader.java @@ -4,7 +4,6 @@ import android.content.res.AssetFileDescriptor; import android.content.res.Resources; import android.net.Uri; -import android.os.Build; import android.os.ParcelFileDescriptor; import android.util.Log; import androidx.annotation.NonNull; @@ -48,25 +47,12 @@ public LoadData buildLoadData( @Nullable private Uri getResourceUri(Integer model) { try { - // Avoid referencing resource names on SDK 19+ to allow resource table optimizations - // to strip out resource names. - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - return Uri.parse( - ContentResolver.SCHEME_ANDROID_RESOURCE - + "://" - + resources.getResourcePackageName(model) - + '/' - + model); - } else { - return Uri.parse( - ContentResolver.SCHEME_ANDROID_RESOURCE - + "://" - + resources.getResourcePackageName(model) - + '/' - + resources.getResourceTypeName(model) - + '/' - + resources.getResourceEntryName(model)); - } + return Uri.parse( + ContentResolver.SCHEME_ANDROID_RESOURCE + + "://" + + resources.getResourcePackageName(model) + + '/' + + model); } catch (Resources.NotFoundException e) { if (Log.isLoggable(TAG, Log.WARN)) { Log.w(TAG, "Received invalid resource id: " + model, e);