From 603d36726fc5ba57f4b2039308c13dc759603c3a Mon Sep 17 00:00:00 2001
From: christosts <christosts@google.com>
Date: Thu, 21 Sep 2023 03:51:24 -0700
Subject: [PATCH] Move DefaultImageDecoderTest in tests

Move DefaultImageDecoderTest in tests since we can decode images with
Robolectric's native graphics mode.

PiperOrigin-RevId: 567259458
---
 .../androidx/media3/exoplayer/image/DefaultImageDecoder.java   | 2 +-
 .../media3/exoplayer/image/DefaultImageDecoderTest.java        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
 rename libraries/exoplayer/src/{androidTest => test}/java/androidx/media3/exoplayer/image/DefaultImageDecoderTest.java (96%)

diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/image/DefaultImageDecoder.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/image/DefaultImageDecoder.java
index 811366dc75..01112f7048 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/image/DefaultImageDecoder.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/image/DefaultImageDecoder.java
@@ -117,7 +117,7 @@ public final class DefaultImageDecoder
   }
 
   @Override
-  public final String getName() {
+  public String getName() {
     return "DefaultImageDecoder";
   }
 
diff --git a/libraries/exoplayer/src/androidTest/java/androidx/media3/exoplayer/image/DefaultImageDecoderTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/image/DefaultImageDecoderTest.java
similarity index 96%
rename from libraries/exoplayer/src/androidTest/java/androidx/media3/exoplayer/image/DefaultImageDecoderTest.java
rename to libraries/exoplayer/src/test/java/androidx/media3/exoplayer/image/DefaultImageDecoderTest.java
index 25cfe4bfc0..3f242f2c6b 100644
--- a/libraries/exoplayer/src/androidTest/java/androidx/media3/exoplayer/image/DefaultImageDecoderTest.java
+++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/image/DefaultImageDecoderTest.java
@@ -18,6 +18,7 @@ package androidx.media3.exoplayer.image;
 import static androidx.media3.common.util.Assertions.checkNotNull;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
+import static org.robolectric.annotation.GraphicsMode.Mode.NATIVE;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -31,9 +32,11 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.annotation.GraphicsMode;
 
 /** Unit tests for {@link DefaultImageDecoder}. */
 @RunWith(AndroidJUnit4.class)
+@GraphicsMode(value = NATIVE)
 public class DefaultImageDecoderTest {
 
   private static final String PNG_TEST_IMAGE_PATH = "media/png/non-motion-photo-shortened.png";