From 1d082ee9a7bf060f8d986b4612208ef8873ef73c Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Tue, 29 Nov 2022 10:59:22 +0000
Subject: [PATCH] Bump cast sdk version and remove workaround for live duration

The fix for b/171657375 (internal) has been shipped with 21.1.0 already
(see https://developers.google.com/cast/docs/release-notes#august-8,-2022).

PiperOrigin-RevId: 491583727
(cherry picked from commit 835d3c89f2099ca66c5b5f7af686eace1ac17eb8)
---
 RELEASENOTES.md                                           | 2 ++
 libraries/cast/build.gradle                               | 2 +-
 .../src/main/java/androidx/media3/cast/CastUtils.java     | 8 +-------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 22c5a30d27..5eeaf2f8d2 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -19,6 +19,8 @@
 *   Metadata:
     *   Parse multiple null-separated values from ID3 frames, as permitted by
         ID3 v2.4.
+*   Cast extension
+    *   Bump Cast SDK version to 21.2.0.
 
 ### 1.0.0-beta03 (2022-11-22)
 
diff --git a/libraries/cast/build.gradle b/libraries/cast/build.gradle
index 32dbee1e1e..87f7e6f20c 100644
--- a/libraries/cast/build.gradle
+++ b/libraries/cast/build.gradle
@@ -14,7 +14,7 @@
 apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
 
 dependencies {
-    api 'com.google.android.gms:play-services-cast-framework:21.0.1'
+    api 'com.google.android.gms:play-services-cast-framework:21.2.0'
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     implementation project(modulePrefix + 'lib-common')
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
diff --git a/libraries/cast/src/main/java/androidx/media3/cast/CastUtils.java b/libraries/cast/src/main/java/androidx/media3/cast/CastUtils.java
index a7a2481843..5e0b045cd8 100644
--- a/libraries/cast/src/main/java/androidx/media3/cast/CastUtils.java
+++ b/libraries/cast/src/main/java/androidx/media3/cast/CastUtils.java
@@ -26,10 +26,6 @@ import com.google.android.gms.cast.MediaTrack;
 /** Utility methods for Cast integration. */
 /* package */ final class CastUtils {
 
-  /** The duration returned by {@link MediaInfo#getStreamDuration()} for live streams. */
-  // TODO: Remove once [Internal ref: b/171657375] is fixed.
-  private static final long LIVE_STREAM_DURATION = -1000;
-
   /**
    * Returns the duration in microseconds advertised by a media info, or {@link C#TIME_UNSET} if
    * unknown or not applicable.
@@ -42,9 +38,7 @@ import com.google.android.gms.cast.MediaTrack;
       return C.TIME_UNSET;
     }
     long durationMs = mediaInfo.getStreamDuration();
-    return durationMs != MediaInfo.UNKNOWN_DURATION && durationMs != LIVE_STREAM_DURATION
-        ? Util.msToUs(durationMs)
-        : C.TIME_UNSET;
+    return durationMs != MediaInfo.UNKNOWN_DURATION ? Util.msToUs(durationMs) : C.TIME_UNSET;
   }
 
   /**