Use DataSpec request headers in HttpMediaDrmCallback

PiperOrigin-RevId: 309944716

library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java

@@ -27,6 +27,7 @@ import com.google.android.exoplayer2.upstream.HttpDataSource.InvalidResponseCode
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.io.IOException;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -138,17 +139,13 @@ public final class HttpMediaDrmCallback implements MediaDrmCallback {
       @Nullable Map<String, String> requestProperties)
       @Nullable Map<String, String> requestProperties)
       throws IOException {
       throws IOException {
     HttpDataSource dataSource = dataSourceFactory.createDataSource();
     HttpDataSource dataSource = dataSourceFactory.createDataSource();
-    if (requestProperties != null) {
-      for (Map.Entry<String, String> requestProperty : requestProperties.entrySet()) {
-        dataSource.setRequestProperty(requestProperty.getKey(), requestProperty.getValue());
-      }
-    }
-
     int manualRedirectCount = 0;
     int manualRedirectCount = 0;
     while (true) {
     while (true) {
       DataSpec dataSpec =
       DataSpec dataSpec =
           new DataSpec.Builder()
           new DataSpec.Builder()
               .setUri(url)
               .setUri(url)
+              .setHttpRequestHeaders(
+                  requestProperties != null ? requestProperties : Collections.emptyMap())
               .setHttpMethod(DataSpec.HTTP_METHOD_POST)
               .setHttpMethod(DataSpec.HTTP_METHOD_POST)
               .setHttpBody(httpBody)
               .setHttpBody(httpBody)
               .setFlags(DataSpec.FLAG_ALLOW_GZIP)
               .setFlags(DataSpec.FLAG_ALLOW_GZIP)