From 7cf500bc2d3908171ced9c9856265835eee92987 Mon Sep 17 00:00:00 2001
From: Ian Baker <ibaker@google.com>
Date: Wed, 23 Oct 2024 14:31:41 +0100
Subject: [PATCH] Fix compilation of MergingMediaSourceTest

---
 .../androidx/media3/exoplayer/analytics/AnalyticsListener.java | 2 +-
 .../media3/exoplayer/source/MergingMediaSourceTest.java        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/AnalyticsListener.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/AnalyticsListener.java
index 76a6591a2c..83785bfa05 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/AnalyticsListener.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/AnalyticsListener.java
@@ -845,7 +845,7 @@ public interface AnalyticsListener {
 
   /**
    * @deprecated Implement {@link #onLoadStarted(EventTime, LoadEventInfo, MediaLoadData, int)}
-   * instead.
+   *     instead.
    */
   @UnstableApi
   @Deprecated
diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/MergingMediaSourceTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/MergingMediaSourceTest.java
index b39328c399..5630e97945 100644
--- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/MergingMediaSourceTest.java
+++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/MergingMediaSourceTest.java
@@ -139,7 +139,8 @@ public class MergingMediaSourceTest {
               int windowIndex,
               @Nullable MediaPeriodId mediaPeriodId,
               LoadEventInfo loadEventInfo,
-              MediaLoadData mediaLoadData) {
+              MediaLoadData mediaLoadData,
+              int retryCount) {
             if (mediaPeriodId != null) {
               onLoadStartedMediaPeriodUids.add(mediaPeriodId.periodUid);
             }