From 2a726cfe9fc2595beae929e023d24b633e251c7b Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Fri, 29 Apr 2022 12:00:39 +0100
Subject: [PATCH] Use cronet for DRM requests in the main demo app

This ensures that both content and licenses are requested using the
same HTTP stack.

#minor-release

PiperOrigin-RevId: 445378940
---
 .../main/java/androidx/media3/demo/main/PlayerActivity.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java b/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java
index a013cc9253..96c4a9ce55 100644
--- a/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java
+++ b/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java
@@ -42,6 +42,7 @@ import androidx.media3.common.util.Util;
 import androidx.media3.datasource.DataSource;
 import androidx.media3.exoplayer.ExoPlayer;
 import androidx.media3.exoplayer.RenderersFactory;
+import androidx.media3.exoplayer.drm.DefaultDrmSessionManagerProvider;
 import androidx.media3.exoplayer.drm.FrameworkMediaDrm;
 import androidx.media3.exoplayer.ima.ImaAdsLoader;
 import androidx.media3.exoplayer.ima.ImaServerSideAdInsertionMediaSource;
@@ -302,6 +303,10 @@ public class PlayerActivity extends AppCompatActivity
   }
 
   private MediaSource.Factory createMediaSourceFactory() {
+    DefaultDrmSessionManagerProvider drmSessionManagerProvider =
+        new DefaultDrmSessionManagerProvider();
+    drmSessionManagerProvider.setDrmHttpDataSourceFactory(
+        DemoUtil.getHttpDataSourceFactory(/* context= */ this));
     ImaServerSideAdInsertionMediaSource.AdsLoader.Builder serverSideAdLoaderBuilder =
         new ImaServerSideAdInsertionMediaSource.AdsLoader.Builder(/* context= */ this, playerView);
     if (serverSideAdsLoaderState != null) {
@@ -312,6 +317,7 @@ public class PlayerActivity extends AppCompatActivity
         new ImaServerSideAdInsertionMediaSource.Factory(
             serverSideAdsLoader, new DefaultMediaSourceFactory(dataSourceFactory));
     return new DefaultMediaSourceFactory(dataSourceFactory)
+        .setDrmSessionManagerProvider(drmSessionManagerProvider)
         .setAdsLoaderProvider(this::getClientSideAdsLoader)
         .setAdViewProvider(playerView)
         .setServerSideAdInsertionMediaSourceFactory(imaServerSideAdInsertionMediaSourceFactory);