Change asset uri data fetcher to return AssetFileDescriptor rather than ParcelFileDescriptor.

PiperOrigin-RevId: 419944523

Author: sjudd

instrumentation/src/androidTest/java/com/bumptech/glide/LoadAssetUriTest.java

@@ -14,7 +14,6 @@
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -40,7 +39,6 @@ public void setUp() throws IOException {
   }
 
   @Test
-  @Ignore("b/213227559")
   public void loadVideoAssetUri_decodesFrame() {
     Uri uri = Uri.parse(assetNameToUri(VIDEO_ASSET_NAME));
 
@@ -50,7 +48,6 @@ public void loadVideoAssetUri_decodesFrame() {
   }
 
   @Test
-  @Ignore("b/213227559")
   public void loadVideoAssetUri_asBitmap_decodesFrame() {
     Uri uri = Uri.parse(assetNameToUri(VIDEO_ASSET_NAME));
 
@@ -60,7 +57,6 @@ public void loadVideoAssetUri_asBitmap_decodesFrame() {
   }
 
   @Test
-  @Ignore("b/213227559")
   public void loadVideoAssetUri_withFrame_decodesFrame() {
     Uri uri = Uri.parse(assetNameToUri(VIDEO_ASSET_NAME));
 
@@ -76,7 +72,6 @@ public void loadVideoAssetUri_withFrame_decodesFrame() {
   }
 
   @Test
-  @Ignore("b/213227559")
   public void loadVideoAssetUriString_decodesFrame() {
     Uri uri = Uri.parse(assetNameToUri(VIDEO_ASSET_NAME));
 
@@ -86,7 +81,6 @@ public void loadVideoAssetUriString_decodesFrame() {
   }
 
   @Test
-  @Ignore("b/213227559")
   public void loadVideoAssetUriString_withFrame_decodesFrame() {
     Uri uri = Uri.parse(assetNameToUri(VIDEO_ASSET_NAME));
 

library/src/main/java/com/bumptech/glide/Glide.java

@@ -542,7 +542,7 @@ Uri.class, Bitmap.class, new ResourceBitmapDecoder(resourceDrawableDecoder, bitm
         .append(Uri.class, InputStream.class, new AssetUriLoader.StreamFactory(context.getAssets()))
         .append(
             Uri.class,
-            ParcelFileDescriptor.class,
+            AssetFileDescriptor.class,
             new AssetUriLoader.FileDescriptorFactory(context.getAssets()))
         .append(Uri.class, InputStream.class, new MediaStoreImageThumbLoader.Factory(context))
         .append(Uri.class, InputStream.class, new MediaStoreVideoThumbLoader.Factory(context));

library/src/main/java/com/bumptech/glide/load/data/FileDescriptorAssetPathFetcher.java

@@ -1,30 +1,30 @@
 package com.bumptech.glide.load.data;
 
+import android.content.res.AssetFileDescriptor;
 import android.content.res.AssetManager;
-import android.os.ParcelFileDescriptor;
 import androidx.annotation.NonNull;
 import java.io.IOException;
 
-/** Fetches an {@link android.os.ParcelFileDescriptor} for an asset path. */
-public class FileDescriptorAssetPathFetcher extends AssetPathFetcher<ParcelFileDescriptor> {
+/** Fetches an {@link android.content.res.AssetFileDescriptor} for an asset path. */
+public class FileDescriptorAssetPathFetcher extends AssetPathFetcher<AssetFileDescriptor> {
   public FileDescriptorAssetPathFetcher(AssetManager assetManager, String assetPath) {
     super(assetManager, assetPath);
   }
 
   @Override
-  protected ParcelFileDescriptor loadResource(AssetManager assetManager, String path)
+  protected AssetFileDescriptor loadResource(AssetManager assetManager, String path)
       throws IOException {
-    return assetManager.openFd(path).getParcelFileDescriptor();
+    return assetManager.openFd(path);
   }
 
   @Override
-  protected void close(ParcelFileDescriptor data) throws IOException {
+  protected void close(AssetFileDescriptor data) throws IOException {
     data.close();
   }
 
   @NonNull
   @Override
-  public Class<ParcelFileDescriptor> getDataClass() {
-    return ParcelFileDescriptor.class;
+  public Class<AssetFileDescriptor> getDataClass() {
+    return AssetFileDescriptor.class;
   }
 }

library/src/main/java/com/bumptech/glide/load/model/AssetUriLoader.java

@@ -1,9 +1,9 @@
 package com.bumptech.glide.load.model;
 
 import android.content.ContentResolver;
+import android.content.res.AssetFileDescriptor;
 import android.content.res.AssetManager;
 import android.net.Uri;
-import android.os.ParcelFileDescriptor;
 import androidx.annotation.NonNull;
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.data.DataFetcher;
@@ -83,10 +83,10 @@ public DataFetcher<InputStream> buildFetcher(AssetManager assetManager, String a
     }
   }
 
-  /** Factory for loading {@link ParcelFileDescriptor}s from asset manager Uris. */
+  /** Factory for loading {@link AssetFileDescriptor}s from asset manager Uris. */
   public static class FileDescriptorFactory
-      implements ModelLoaderFactory<Uri, ParcelFileDescriptor>,
-          AssetFetcherFactory<ParcelFileDescriptor> {
+      implements ModelLoaderFactory<Uri, AssetFileDescriptor>,
+          AssetFetcherFactory<AssetFileDescriptor> {
 
     private final AssetManager assetManager;
 
@@ -96,7 +96,7 @@ public FileDescriptorFactory(AssetManager assetManager) {
 
     @NonNull
     @Override
-    public ModelLoader<Uri, ParcelFileDescriptor> build(MultiModelLoaderFactory multiFactory) {
+    public ModelLoader<Uri, AssetFileDescriptor> build(MultiModelLoaderFactory multiFactory) {
       return new AssetUriLoader<>(assetManager, this);
     }
 
@@ -106,7 +106,7 @@ public void teardown() {
     }
 
     @Override
-    public DataFetcher<ParcelFileDescriptor> buildFetcher(
+    public DataFetcher<AssetFileDescriptor> buildFetcher(
         AssetManager assetManager, String assetPath) {
       return new FileDescriptorAssetPathFetcher(assetManager, assetPath);
     }

library/test/src/test/java/com/bumptech/glide/load/data/FileDescriptorAssetPathFetcherTest.java

@@ -1,14 +1,12 @@
 package com.bumptech.glide.load.data;
 
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.res.AssetFileDescriptor;
 import android.content.res.AssetManager;
-import android.os.ParcelFileDescriptor;
 import com.bumptech.glide.Priority;
 import java.io.IOException;
 import org.junit.Before;
@@ -25,45 +23,42 @@ public class FileDescriptorAssetPathFetcherTest {
 
   @Mock private AssetManager assetManager;
   @Mock private AssetFileDescriptor assetFileDescriptor;
-  @Mock private DataFetcher.DataCallback<ParcelFileDescriptor> callback;
+  @Mock private DataFetcher.DataCallback<AssetFileDescriptor> callback;
 
   private FileDescriptorAssetPathFetcher fetcher;
-  private ParcelFileDescriptor expected;
 
   @Before
   public void setUp() throws IOException {
     MockitoAnnotations.initMocks(this);
     String assetPath = "/some/asset/path";
     fetcher = new FileDescriptorAssetPathFetcher(assetManager, assetPath);
-    expected = mock(ParcelFileDescriptor.class);
-    when(assetFileDescriptor.getParcelFileDescriptor()).thenReturn(expected);
     when(assetManager.openFd(eq(assetPath))).thenReturn(assetFileDescriptor);
   }
 
   @Test
   public void testOpensInputStreamForPathWithAssetManager() throws Exception {
     fetcher.loadData(Priority.NORMAL, callback);
-    verify(callback).onDataReady(eq(expected));
+    verify(callback).onDataReady(eq(assetFileDescriptor));
   }
 
   @Test
   public void testClosesOpenedInputStreamOnCleanup() throws Exception {
     fetcher.loadData(Priority.NORMAL, callback);
     fetcher.cleanup();
 
-    verify(expected).close();
+    verify(assetFileDescriptor).close();
   }
 
   @Test
   public void testDoesNothingOnCleanupIfNoDataLoaded() throws IOException {
     fetcher.cleanup();
-    verify(expected, never()).close();
+    verify(assetFileDescriptor, never()).close();
   }
 
   @Test
   public void testDoesNothingOnCancel() throws Exception {
     fetcher.loadData(Priority.NORMAL, callback);
     fetcher.cancel();
-    verify(expected, never()).close();
+    verify(assetFileDescriptor, never()).close();
   }
 }