From 73114e3987f7ee729e74857a797f3520c79842a3 Mon Sep 17 00:00:00 2001
From: christosts <christosts@google.com>
Date: Wed, 13 Jan 2021 16:14:09 +0000
Subject: [PATCH] Remove deprecated method DrmInitData.get(UUID)

PiperOrigin-RevId: 351589689
---
 RELEASENOTES.md                               |  2 ++
 .../android/exoplayer2/drm/DrmInitData.java   | 18 -----------
 .../exoplayer2/drm/DrmInitDataTest.java       | 32 +------------------
 3 files changed, 3 insertions(+), 49 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 7ccf9f930d..8e13b73bd8 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -8,6 +8,8 @@
             `Player.EventListener.onTimelineChanged(Timeline, int)` instead.
         *   `DefaultLoadControl` constructors. Use `DefaultLoadControl.Builder`
             instead.
+        *   `DrmInitData.get(UUID)`. Use `DrmInitData.get(int)` and
+            `DrmInitData.SchemeData.matches(UUID)` instead.
         *   `MappedTrackInfo.getTrackFormatSupport(int, int, int)`. Use
             `MappedTrackInfo.getTrackSupport(int, int, int)`.
         *   `MappedTrackInfo.getTrackTypeRendererSupport(int)`. Use
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java b/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
index 0b9612df95..bc2b8bba86 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
@@ -143,24 +143,6 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
     schemeDataCount = schemeDatas.length;
   }
 
-  /**
-   * Retrieves data for a given DRM scheme, specified by its UUID.
-   *
-   * @deprecated Use {@link #get(int)} and {@link SchemeData#matches(UUID)} instead.
-   * @param uuid The DRM scheme's UUID.
-   * @return The initialization data for the scheme, or null if the scheme is not supported.
-   */
-  @Deprecated
-  @Nullable
-  public SchemeData get(UUID uuid) {
-    for (SchemeData schemeData : schemeDatas) {
-      if (schemeData.matches(uuid)) {
-        return schemeData;
-      }
-    }
-    return null;
-  }
-
   /**
    * Retrieves the {@link SchemeData} at a given index.
    *
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java b/library/common/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
index f196641332..e292bfba78 100644
--- a/library/common/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
+++ b/library/common/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
@@ -93,34 +93,6 @@ public class DrmInitDataTest {
     assertThat(testInitData).isNotEqualTo(drmInitData);
   }
 
-  @Test
-  @SuppressWarnings("deprecation")
-  public void getByUuid() {
-    // Basic matching.
-    DrmInitData testInitData = new DrmInitData(DATA_1, DATA_2);
-    assertThat(testInitData.get(WIDEVINE_UUID)).isEqualTo(DATA_1);
-    assertThat(testInitData.get(PLAYREADY_UUID)).isEqualTo(DATA_2);
-    assertThat(testInitData.get(UUID_NIL)).isNull();
-
-    // Basic matching including universal data.
-    testInitData = new DrmInitData(DATA_1, DATA_2, DATA_UNIVERSAL);
-    assertThat(testInitData.get(WIDEVINE_UUID)).isEqualTo(DATA_1);
-    assertThat(testInitData.get(PLAYREADY_UUID)).isEqualTo(DATA_2);
-    assertThat(testInitData.get(UUID_NIL)).isEqualTo(DATA_UNIVERSAL);
-
-    // Passing the scheme data in reverse order shouldn't affect equality.
-    testInitData = new DrmInitData(DATA_UNIVERSAL, DATA_2, DATA_1);
-    assertThat(testInitData.get(WIDEVINE_UUID)).isEqualTo(DATA_1);
-    assertThat(testInitData.get(PLAYREADY_UUID)).isEqualTo(DATA_2);
-    assertThat(testInitData.get(UUID_NIL)).isEqualTo(DATA_UNIVERSAL);
-
-    // Universal data should be returned in the absence of a specific match.
-    testInitData = new DrmInitData(DATA_1, DATA_UNIVERSAL);
-    assertThat(testInitData.get(WIDEVINE_UUID)).isEqualTo(DATA_1);
-    assertThat(testInitData.get(PLAYREADY_UUID)).isEqualTo(DATA_UNIVERSAL);
-    assertThat(testInitData.get(UUID_NIL)).isEqualTo(DATA_UNIVERSAL);
-  }
-
   @Test
   public void getByIndex() {
     DrmInitData testInitData = new DrmInitData(DATA_1, DATA_2);
@@ -128,12 +100,10 @@ public class DrmInitDataTest {
   }
 
   @Test
-  @SuppressWarnings("deprecation")
   public void schemeDatasWithSameUuid() {
     DrmInitData testInitData = new DrmInitData(DATA_1, DATA_1B);
+
     assertThat(testInitData.schemeDataCount).isEqualTo(2);
-    // Deprecated get method should return first entry.
-    assertThat(testInitData.get(WIDEVINE_UUID)).isEqualTo(DATA_1);
     // Test retrieval of first and second entry.
     assertThat(testInitData.get(0)).isEqualTo(DATA_1);
     assertThat(testInitData.get(1)).isEqualTo(DATA_1B);