From 5be7d4da9eebe325848291dc31dbf808f283463b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 15 Feb 2021 12:37:15 +0000
Subject: [PATCH] Don't clear audioSessionId when audio disabled

Issue: #8585
PiperOrigin-RevId: 357553237
---
 RELEASENOTES.md                                                | 3 +++
 .../java/com/google/android/exoplayer2/SimpleExoPlayer.java    | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f0729ab173..3127ef60c9 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -4,6 +4,9 @@
 
 *   Extractors:
     *   Add support for MP4 and QuickTime meta atoms that are not full atoms.
+*   Audio:
+    *   Fix `SimpleExoPlayer` reporting audio session ID as 0 in some cases
+        ([#8585](https://github.com/google/ExoPlayer/issues/8585)).
 
 ### 2.13.1 (2021-02-12)
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index e89e05eb64..a98e3475af 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -2140,7 +2140,6 @@ public class SimpleExoPlayer extends BasePlayer
       analyticsCollector.onAudioDisabled(counters);
       audioFormat = null;
       audioDecoderCounters = null;
-      audioSessionId = C.AUDIO_SESSION_ID_UNSET;
     }
 
     @Override