From 33af7a45367ffad2d2f01a6ed0137c5d4abf3cf1 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 4 Aug 2020 09:47:18 +0100
Subject: [PATCH] Don't log mediaId in EventLogger and
 DefaultMediaSourceFactory.

The media id defaults to the URI that shouldn't be logged to logcat.

PiperOrigin-RevId: 324770157
---
 .../exoplayer2/source/DefaultMediaSourceFactory.java        | 6 +-----
 .../com/google/android/exoplayer2/util/EventLogger.java     | 2 --
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java
index b4d9809a88..4e79b1a8bf 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java
@@ -381,11 +381,7 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory {
     }
     AdsLoader adsLoader = adSupportProvider.getAdsLoader(mediaItem.playbackProperties.adTagUri);
     if (adsLoader == null) {
-      Log.w(
-          TAG,
-          String.format(
-              "Playing media without ads. No AdsLoader for media item with mediaId '%s'.",
-              mediaItem.mediaId));
+      Log.w(TAG, "Playing media without ads. No AdsLoader for provided adTagUri");
       return mediaSource;
     }
     return new AdsMediaSource(
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java b/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
index b53081050f..293264504f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
@@ -195,8 +195,6 @@ public class EventLogger implements AnalyticsListener {
     logd(
         "mediaItem ["
             + getEventTimeString(eventTime)
-            + ", "
-            + (mediaItem == null ? "null" : "mediaId=" + mediaItem.mediaId)
             + ", reason="
             + getMediaItemTransitionReasonString(reason)
             + "]");