From f1c21f6c079556a214d1aa181341c182b500851e Mon Sep 17 00:00:00 2001
From: tofunmi <tofunmi@google.com>
Date: Tue, 20 Feb 2024 04:05:34 -0800
Subject: [PATCH] Rollback of
 https://github.com/androidx/media/commit/5a3f18f83722a7ab2d55eb91f0b3abec02f38301

PiperOrigin-RevId: 608551290
---
 .../media3/datasource/DataSourceBitmapLoader.java         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/datasource/src/main/java/androidx/media3/datasource/DataSourceBitmapLoader.java b/libraries/datasource/src/main/java/androidx/media3/datasource/DataSourceBitmapLoader.java
index 5878784d8b..f8a927bbf6 100644
--- a/libraries/datasource/src/main/java/androidx/media3/datasource/DataSourceBitmapLoader.java
+++ b/libraries/datasource/src/main/java/androidx/media3/datasource/DataSourceBitmapLoader.java
@@ -47,7 +47,7 @@ import java.util.concurrent.Executors;
  * that is shared between instances of this class.
  */
 @UnstableApi
-public class DataSourceBitmapLoader implements BitmapLoader {
+public final class DataSourceBitmapLoader implements BitmapLoader {
 
   public static final Supplier<ListeningExecutorService> DEFAULT_EXECUTOR_SERVICE =
       Suppliers.memoize(
@@ -100,19 +100,19 @@ public class DataSourceBitmapLoader implements BitmapLoader {
   }
 
   @Override
-  public final ListenableFuture<Bitmap> decodeBitmap(byte[] data) {
+  public ListenableFuture<Bitmap> decodeBitmap(byte[] data) {
     return listeningExecutorService.submit(() -> decode(data, options));
   }
 
   @Override
-  public final ListenableFuture<Bitmap> loadBitmap(Uri uri) {
+  public ListenableFuture<Bitmap> loadBitmap(Uri uri) {
     return listeningExecutorService.submit(
         () -> load(dataSourceFactory.createDataSource(), uri, options));
   }
 
   // BitmapFactory's options parameter is null-ok.
   @SuppressWarnings("nullness:argument.type.incompatible")
-  protected static Bitmap decode(byte[] data, @Nullable BitmapFactory.Options options)
+  private static Bitmap decode(byte[] data, @Nullable BitmapFactory.Options options)
       throws IOException {
     @Nullable
     Bitmap bitmap = BitmapFactory.decodeByteArray(data, /* offset= */ 0, data.length, options);