From 965062857d4d327a7e93f94c12b72dede072b7e3 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 25 Nov 2021 10:01:47 +0000
Subject: [PATCH] Move MediaMetricsListener creation to static constructor
 method.

This allows to check if the media metrics service is available outside
the actual constructor and to fail gracefully if it is missing.

PiperOrigin-RevId: 412232425
---
 .../analytics/MediaMetricsListener.java       | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/MediaMetricsListener.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/MediaMetricsListener.java
index 0ebad570b5..d1289112b8 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/MediaMetricsListener.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/MediaMetricsListener.java
@@ -16,7 +16,6 @@
 package androidx.media3.exoplayer.analytics;
 
 import static androidx.media3.common.util.Assertions.checkNotNull;
-import static androidx.media3.common.util.Assertions.checkStateNotNull;
 import static androidx.media3.common.util.Util.castNonNull;
 
 import android.annotation.SuppressLint;
@@ -92,6 +91,23 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
 public final class MediaMetricsListener
     implements AnalyticsListener, PlaybackSessionManager.Listener {
 
+  /**
+   * Creates a media metrics listener.
+   *
+   * @param context A context.
+   * @return The {@link MediaMetricsListener}, or null if the {@link Context#MEDIA_METRICS_SERVICE
+   *     media metrics service} isn't available.
+   */
+  @Nullable
+  public static MediaMetricsListener create(Context context) {
+    @Nullable
+    MediaMetricsManager mediaMetricsManager =
+        (MediaMetricsManager) context.getSystemService(Context.MEDIA_METRICS_SERVICE);
+    return mediaMetricsManager == null
+        ? null
+        : new MediaMetricsListener(context, mediaMetricsManager.createPlaybackSession());
+  }
+
   private final Context context;
   private final PlaybackSessionManager sessionManager;
   private final PlaybackSession playbackSession;
@@ -124,15 +140,12 @@ public final class MediaMetricsListener
    *
    * @param context A {@link Context}.
    */
-  public MediaMetricsListener(Context context) {
+  private MediaMetricsListener(Context context, PlaybackSession playbackSession) {
     context = context.getApplicationContext();
     this.context = context;
+    this.playbackSession = playbackSession;
     window = new Timeline.Window();
     period = new Timeline.Period();
-    MediaMetricsManager mediaMetricsManager =
-        checkStateNotNull(
-            (MediaMetricsManager) context.getSystemService(Context.MEDIA_METRICS_SERVICE));
-    playbackSession = mediaMetricsManager.createPlaybackSession();
     startTimeMs = SystemClock.elapsedRealtime();
     currentPlaybackState = PlaybackStateEvent.STATE_NOT_STARTED;
     currentNetworkType = NetworkEvent.NETWORK_TYPE_UNKNOWN;