From 0c564004c44c23d167f79d9cc4b04634e8297471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= <m.gaetan89@gmail.com>
Date: Mon, 15 Jul 2024 12:00:57 +0200
Subject: [PATCH] Remove unnecessary `@SdkSuppress` annotation

---
 .../media3/session/legacy/AudioAttributesCompatTest.java     | 5 -----
 .../media3/session/legacy/MediaDescriptionCompatTest.java    | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/legacy/AudioAttributesCompatTest.java b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/legacy/AudioAttributesCompatTest.java
index b9b801124e..ac7005bdf3 100644
--- a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/legacy/AudioAttributesCompatTest.java
+++ b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/legacy/AudioAttributesCompatTest.java
@@ -22,7 +22,6 @@ import static org.hamcrest.core.IsNot.not;
 import android.media.AudioAttributes;
 import android.media.AudioManager;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.SdkSuppress;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -51,7 +50,6 @@ public class AudioAttributesCompatTest {
   AudioAttributesCompat mNotificationLegacyAAC;
 
   @Before
-  @SdkSuppress(minSdkVersion = 21)
   public void setUpApi21() {
     mMediaAA =
         new AudioAttributes.Builder()
@@ -76,7 +74,6 @@ public class AudioAttributesCompatTest {
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = 21)
   public void testCreateWithAudioAttributesApi21() {
     assertThat(mMediaAACFromAA, not(equalTo(null)));
     assertThat((AudioAttributes) mMediaAACFromAA.unwrap(), equalTo(mMediaAA));
@@ -86,7 +83,6 @@ public class AudioAttributesCompatTest {
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = 21)
   public void testEqualityApi21() {
     assertThat("self equality", mMediaAACFromAA, equalTo(mMediaAACFromAA));
     assertThat("different things", mMediaAACFromAA, not(equalTo(mNotificationAAC)));
@@ -122,7 +118,6 @@ public class AudioAttributesCompatTest {
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = 21)
   public void testLegacyStreamTypeInferenceApi21() {
     assertThat(mMediaAACFromAA.getLegacyStreamType(), equalTo(AudioManager.STREAM_MUSIC));
   }
diff --git a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/legacy/MediaDescriptionCompatTest.java b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/legacy/MediaDescriptionCompatTest.java
index 5c7e18c4df..4d0483bf58 100644
--- a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/legacy/MediaDescriptionCompatTest.java
+++ b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/legacy/MediaDescriptionCompatTest.java
@@ -22,7 +22,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import androidx.media3.test.session.common.TestUtils;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.SdkSuppress;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -30,7 +29,6 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidJUnit4.class)
 public class MediaDescriptionCompatTest {
 
-  @SdkSuppress(minSdkVersion = 21)
   @Test
   public void roundTripViaFrameworkObject_returnsEqualMediaUriAndExtras() {
     Uri mediaUri = Uri.parse("androidx://media/uri");
@@ -54,7 +52,6 @@ public class MediaDescriptionCompatTest {
     TestUtils.equals(createExtras(), restoredDescription2.getExtras());
   }
 
-  @SdkSuppress(minSdkVersion = 21)
   @Test
   public void getMediaDescription_withMediaUri_doesNotTouchExtras() {
     MediaDescriptionCompat originalDescription =