From 5c4b8085a0fe7c3c23ff6d770b8cd25ae0f886a8 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Tue, 14 Jul 2020 17:37:06 +0100
Subject: [PATCH] Migrate usages of DefaultDrmSessionManager constructor to
 Builder

PiperOrigin-RevId: 321174738
---
 .../drm/DefaultDrmSessionManager.java         |  1 +
 .../playbacktests/gts/DashTestRunner.java     | 44 +++++++++----------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
index db98e9401b..890c2dac28 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
@@ -326,6 +326,7 @@ public class DefaultDrmSessionManager implements DrmSessionManager {
    *     Default is false.
    * @deprecated Use {@link Builder} instead.
    */
+  @SuppressWarnings("deprecation")
   @Deprecated
   public DefaultDrmSessionManager(
       UUID uuid,
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
index ea745ed257..c8c4f98a85 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
@@ -262,29 +262,29 @@ import java.util.List;
       if (widevineLicenseUrl == null) {
         return DrmSessionManager.getDummyDrmSessionManager();
       }
-      try {
-        MediaDrmCallback drmCallback = new HttpMediaDrmCallback(widevineLicenseUrl,
-            new DefaultHttpDataSourceFactory(userAgent));
-        FrameworkMediaDrm frameworkMediaDrm = FrameworkMediaDrm.newInstance(WIDEVINE_UUID);
-        DefaultDrmSessionManager drmSessionManager =
-            new DefaultDrmSessionManager(
-                C.WIDEVINE_UUID,
-                frameworkMediaDrm,
-                drmCallback,
-                /* keyRequestParameters= */ null,
-                /* multiSession= */ false,
-                DefaultDrmSessionManager.INITIAL_DRM_REQUEST_RETRY_COUNT);
-        if (!useL1Widevine) {
-          frameworkMediaDrm.setPropertyString(SECURITY_LEVEL_PROPERTY, WIDEVINE_SECURITY_LEVEL_3);
-        }
-        if (offlineLicenseKeySetId != null) {
-          drmSessionManager.setMode(DefaultDrmSessionManager.MODE_PLAYBACK,
-              offlineLicenseKeySetId);
-        }
-        return drmSessionManager;
-      } catch (UnsupportedDrmException e) {
-        throw new IllegalStateException(e);
+      MediaDrmCallback drmCallback =
+          new HttpMediaDrmCallback(widevineLicenseUrl, new DefaultHttpDataSourceFactory(userAgent));
+      DefaultDrmSessionManager drmSessionManager =
+          new DefaultDrmSessionManager.Builder()
+              .setUuidAndExoMediaDrmProvider(
+                  C.WIDEVINE_UUID,
+                  uuid -> {
+                    try {
+                      FrameworkMediaDrm drm = FrameworkMediaDrm.newInstance(WIDEVINE_UUID);
+                      if (!useL1Widevine) {
+                        drm.setPropertyString(SECURITY_LEVEL_PROPERTY, WIDEVINE_SECURITY_LEVEL_3);
+                      }
+                      return drm;
+                    } catch (UnsupportedDrmException e) {
+                      throw new IllegalStateException(e);
+                    }
+                  })
+              .build(drmCallback);
+
+      if (offlineLicenseKeySetId != null) {
+        drmSessionManager.setMode(DefaultDrmSessionManager.MODE_PLAYBACK, offlineLicenseKeySetId);
       }
+      return drmSessionManager;
     }
 
     @Override