From 6084a552a9b3212130355c8e9bc0f94cd9af1505 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 14 Jan 2021 00:18:06 +0000
Subject: [PATCH] Rename AnalyticsListener.onAudioSessionId for consistency

PiperOrigin-RevId: 351687086
---
 RELEASENOTES.md                                             | 4 ++--
 .../android/exoplayer2/analytics/AnalyticsCollector.java    | 2 +-
 .../android/exoplayer2/analytics/AnalyticsListener.java     | 6 +++---
 .../com/google/android/exoplayer2/util/EventLogger.java     | 2 +-
 .../exoplayer2/analytics/AnalyticsCollectorTest.java        | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 2e8be5474d..cb00692aa7 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -152,8 +152,8 @@
         which can be immediately queried by calling
         `SimpleExoPlayer.getAudioSessionId`. The audio session ID will only
         change if application code calls `SimpleExoPlayer.setAudioSessionId`.
-    *   `AudioListener.onAudioSessionId` is replaced with
-        `AudioListener.onAudioSessionIdChanged`. Note that
+    *   `onAudioSessionId` is replaced with `onAudioSessionIdChanged` in
+        `AudioListener` and `AnalyticsListener`. Note that
         `onAudioSessionIdChanged` is called in fewer cases than
         `onAudioSessionId` was called, due to the improved handling of audio
         session IDs as described above.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
index a2146f03b8..0d22b8add6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
@@ -305,7 +305,7 @@ public class AnalyticsCollector
     sendEvent(
         eventTime,
         AnalyticsListener.EVENT_AUDIO_SESSION_ID,
-        listener -> listener.onAudioSessionId(eventTime, audioSessionId));
+        listener -> listener.onAudioSessionIdChanged(eventTime, audioSessionId));
   }
 
   @Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
index 6589b98351..7692ec47e2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
@@ -805,12 +805,12 @@ public interface AnalyticsListener {
   default void onAudioDisabled(EventTime eventTime, DecoderCounters counters) {}
 
   /**
-   * Called when the audio session id is set.
+   * Called when the audio session ID changes.
    *
    * @param eventTime The event time.
-   * @param audioSessionId The audio session id.
+   * @param audioSessionId The audio session ID.
    */
-  default void onAudioSessionId(EventTime eventTime, int audioSessionId) {}
+  default void onAudioSessionIdChanged(EventTime eventTime, int audioSessionId) {}
 
   /**
    * Called when the audio attributes change.
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 0866043f4b..c7a4ddce7d 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
@@ -353,7 +353,7 @@ public class EventLogger implements AnalyticsListener {
   }
 
   @Override
-  public void onAudioSessionId(EventTime eventTime, int audioSessionId) {
+  public void onAudioSessionIdChanged(EventTime eventTime, int audioSessionId) {
     logd(eventTime, "audioSessionId", Integer.toString(audioSessionId));
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
index 56b948ab3d..ffdc65160e 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
@@ -2199,7 +2199,7 @@ public final class AnalyticsCollectorTest {
     }
 
     @Override
-    public void onAudioSessionId(EventTime eventTime, int audioSessionId) {
+    public void onAudioSessionIdChanged(EventTime eventTime, int audioSessionId) {
       reportedEvents.add(new ReportedEvent(EVENT_AUDIO_SESSION_ID, eventTime));
     }