From 18b1f3d62419ea7ee888ed2e44aa43576b6e9e57 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Fri, 15 Oct 2021 12:52:12 +0100
Subject: [PATCH] Migrate usages of DrmConfiguration.sessionForClearTypes to
 new field

The new forcedSessionTrackTypes field was introduced in
<unknown commit>.

These usages are migrated in a follow-up change to add confidence that
the deprecated field continued to work correctly.

PiperOrigin-RevId: 403342893
---
 .../google/android/exoplayer2/demo/IntentUtil.java    | 11 ++++++-----
 .../drm/DefaultDrmSessionManagerProvider.java         |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java
index d2726720d9..d3579c8c35 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java
@@ -226,13 +226,14 @@ public class IntentUtil {
     }
     intent.putExtra(DRM_KEY_REQUEST_PROPERTIES_EXTRA + extrasKeySuffix, drmKeyRequestProperties);
 
-    List<@C.TrackType Integer> drmSessionForClearTypes = drmConfiguration.sessionForClearTypes;
-    if (!drmSessionForClearTypes.isEmpty()) {
+    List<@C.TrackType Integer> forcedDrmSessionTrackTypes =
+        drmConfiguration.forcedSessionTrackTypes;
+    if (!forcedDrmSessionTrackTypes.isEmpty()) {
       // Only video and audio together are supported.
       Assertions.checkState(
-          drmSessionForClearTypes.size() == 2
-              && drmSessionForClearTypes.contains(C.TRACK_TYPE_VIDEO)
-              && drmSessionForClearTypes.contains(C.TRACK_TYPE_AUDIO));
+          forcedDrmSessionTrackTypes.size() == 2
+              && forcedDrmSessionTrackTypes.contains(C.TRACK_TYPE_VIDEO)
+              && forcedDrmSessionTrackTypes.contains(C.TRACK_TYPE_AUDIO));
       intent.putExtra(DRM_SESSION_FOR_CLEAR_CONTENT + extrasKeySuffix, true);
     }
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManagerProvider.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManagerProvider.java
index 6976934337..c56817430f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManagerProvider.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManagerProvider.java
@@ -110,7 +110,8 @@ public final class DefaultDrmSessionManagerProvider implements DrmSessionManager
                 drmConfiguration.scheme, FrameworkMediaDrm.DEFAULT_PROVIDER)
             .setMultiSession(drmConfiguration.multiSession)
             .setPlayClearSamplesWithoutKeys(drmConfiguration.playClearContentWithoutKey)
-            .setUseDrmSessionsForClearContent(Ints.toArray(drmConfiguration.sessionForClearTypes))
+            .setUseDrmSessionsForClearContent(
+                Ints.toArray(drmConfiguration.forcedSessionTrackTypes))
             .build(httpDrmCallback);
     drmSessionManager.setMode(MODE_PLAYBACK, drmConfiguration.getKeySetId());
     return drmSessionManager;