From 743a46e1b2dea0e14506ed8dba3f0a36aa79a93b Mon Sep 17 00:00:00 2001
From: krocard <krocard@google.com>
Date: Fri, 11 Feb 2022 18:27:34 +0000
Subject: [PATCH] Do not reference AnalyticsCollector in common constructor

This prevents it to be stripped by R8 if a custom one is
passed.

#minor-release

PiperOrigin-RevId: 428034999
---
 .../androidx/media3/exoplayer/ExoPlayer.java    | 17 +++++++----------
 .../media3/exoplayer/ExoPlayerImpl.java         |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java
index e05289e8c0..23b88faf3d 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java
@@ -16,7 +16,6 @@
 package androidx.media3.exoplayer;
 
 import static androidx.media3.common.util.Assertions.checkArgument;
-import static androidx.media3.common.util.Assertions.checkNotNull;
 import static androidx.media3.common.util.Assertions.checkState;
 
 import android.content.Context;
@@ -65,6 +64,7 @@ import androidx.media3.exoplayer.video.VideoFrameMetadataListener;
 import androidx.media3.exoplayer.video.spherical.CameraMotionListener;
 import androidx.media3.extractor.DefaultExtractorsFactory;
 import androidx.media3.extractor.ExtractorsFactory;
+import com.google.common.base.Function;
 import com.google.common.base.Supplier;
 import java.util.List;
 
@@ -383,7 +383,7 @@ public interface ExoPlayer extends Player {
     /* package */ Supplier<TrackSelector> trackSelectorSupplier;
     /* package */ Supplier<LoadControl> loadControlSupplier;
     /* package */ Supplier<BandwidthMeter> bandwidthMeterSupplier;
-    /* package */ Supplier<AnalyticsCollector> analyticsCollectorSupplier;
+    /* package */ Function<Clock, AnalyticsCollector> analyticsCollectorFunction;
     /* package */ Looper looper;
     @Nullable /* package */ PriorityTaskManager priorityTaskManager;
     /* package */ AudioAttributes audioAttributes;
@@ -547,7 +547,7 @@ public interface ExoPlayer extends Player {
           () -> trackSelector,
           () -> loadControl,
           () -> bandwidthMeter,
-          () -> analyticsCollector);
+          (clock) -> analyticsCollector);
     }
 
     private Builder(
@@ -561,7 +561,7 @@ public interface ExoPlayer extends Player {
           () -> new DefaultTrackSelector(context),
           DefaultLoadControl::new,
           () -> DefaultBandwidthMeter.getSingletonInstance(context),
-          /* analyticsCollectorSupplier= */ null);
+          DefaultAnalyticsCollector::new);
     }
 
     private Builder(
@@ -571,17 +571,14 @@ public interface ExoPlayer extends Player {
         Supplier<TrackSelector> trackSelectorSupplier,
         Supplier<LoadControl> loadControlSupplier,
         Supplier<BandwidthMeter> bandwidthMeterSupplier,
-        @Nullable Supplier<AnalyticsCollector> analyticsCollectorSupplier) {
+        Function<Clock, AnalyticsCollector> analyticsCollectorFunction) {
       this.context = context;
       this.renderersFactorySupplier = renderersFactorySupplier;
       this.mediaSourceFactorySupplier = mediaSourceFactorySupplier;
       this.trackSelectorSupplier = trackSelectorSupplier;
       this.loadControlSupplier = loadControlSupplier;
       this.bandwidthMeterSupplier = bandwidthMeterSupplier;
-      this.analyticsCollectorSupplier =
-          analyticsCollectorSupplier != null
-              ? analyticsCollectorSupplier
-              : () -> new DefaultAnalyticsCollector(checkNotNull(clock));
+      this.analyticsCollectorFunction = analyticsCollectorFunction;
       looper = Util.getCurrentOrMainLooper();
       audioAttributes = AudioAttributes.DEFAULT;
       wakeMode = C.WAKE_MODE_NONE;
@@ -708,7 +705,7 @@ public interface ExoPlayer extends Player {
     @UnstableApi
     public Builder setAnalyticsCollector(AnalyticsCollector analyticsCollector) {
       checkState(!buildCalled);
-      this.analyticsCollectorSupplier = () -> analyticsCollector;
+      this.analyticsCollectorFunction = (clock) -> analyticsCollector;
       return this;
     }
 
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java
index 1280192eee..930349e302 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java
@@ -233,7 +233,7 @@ import java.util.concurrent.TimeoutException;
               + Util.DEVICE_DEBUG_INFO
               + "]");
       applicationContext = builder.context.getApplicationContext();
-      analyticsCollector = builder.analyticsCollectorSupplier.get();
+      analyticsCollector = builder.analyticsCollectorFunction.apply(builder.clock);
       priorityTaskManager = builder.priorityTaskManager;
       audioAttributes = builder.audioAttributes;
       videoScalingMode = builder.videoScalingMode;