From bb568b5150781457fe22c3d4a877e8c99bddc4a2 Mon Sep 17 00:00:00 2001
From: okunhardt <okunhardt@google.com>
Date: Mon, 24 Jun 2024 07:18:11 -0700
Subject: [PATCH] In DemoUtil, don't set cookie handler when using
 HttpEngineDataSource.

HttpEngine does not support cookie storage.

#cherrypick

PiperOrigin-RevId: 646084702
---
 .../main/java/androidx/media3/demo/main/DemoUtil.java    | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/demos/main/src/main/java/androidx/media3/demo/main/DemoUtil.java b/demos/main/src/main/java/androidx/media3/demo/main/DemoUtil.java
index 6a74f1ec5f..44abfef15e 100644
--- a/demos/main/src/main/java/androidx/media3/demo/main/DemoUtil.java
+++ b/demos/main/src/main/java/androidx/media3/demo/main/DemoUtil.java
@@ -106,7 +106,6 @@ public final class DemoUtil {
     }
     context = context.getApplicationContext();
     if (Build.VERSION.SDK_INT >= 34) {
-      setCookieHandler();
       HttpEngine httpEngine = new HttpEngine.Builder(context).build();
       httpDataSourceFactory =
           new HttpEngineDataSource.Factory(httpEngine, Executors.newSingleThreadExecutor());
@@ -122,15 +121,11 @@ public final class DemoUtil {
     }
     // The device doesn't support HttpEngine or we don't want to allow Cronet, or we failed to
     // instantiate a CronetEngine.
-    setCookieHandler();
-    httpDataSourceFactory = new DefaultHttpDataSource.Factory();
-    return httpDataSourceFactory;
-  }
-
-  private static void setCookieHandler() {
     CookieManager cookieManager = new CookieManager();
     cookieManager.setCookiePolicy(CookiePolicy.ACCEPT_ORIGINAL_SERVER);
     CookieHandler.setDefault(cookieManager);
+    httpDataSourceFactory = new DefaultHttpDataSource.Factory();
+    return httpDataSourceFactory;
   }
 
   /** Returns a {@link DataSource.Factory}. */