From bbec6bcec2b18e61b5fa4e40424a246876dd130c Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Fri, 3 Dec 2021 14:35:10 +0000
Subject: [PATCH] Make mapping of STATE_IDLE configurable

PiperOrigin-RevId: 413922123
---
 .../ext/mediasession/MediaSessionConnector.java  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index 85b141eba8..e15fa6b5a6 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -467,6 +467,7 @@ public final class MediaSessionConnector {
   private boolean metadataDeduplicationEnabled;
   private boolean dispatchUnsupportedActionsEnabled;
   private boolean clearMediaItemsOnStop;
+  private boolean mapIdleToStopped;
 
   /**
    * Creates an instance.
@@ -709,6 +710,15 @@ public final class MediaSessionConnector {
     this.clearMediaItemsOnStop = clearMediaItemsOnStop;
   }
 
+  /**
+   * Sets whether {@link Player#STATE_IDLE} should be mapped to {@link
+   * PlaybackStateCompat#STATE_STOPPED}. The default is false {@link Player#STATE_IDLE} which maps
+   * to {@link PlaybackStateCompat#STATE_NONE}.
+   */
+  public void setMapStateIdleToSessionStateStopped(boolean mapIdleToStopped) {
+    this.mapIdleToStopped = mapIdleToStopped;
+  }
+
   /**
    * Sets whether {@link MediaMetadataProvider#sameAs(MediaMetadataCompat, MediaMetadataCompat)}
    * should be consulted before calling {@link MediaSessionCompat#setMetadata(MediaMetadataCompat)}.
@@ -984,7 +994,7 @@ public final class MediaSessionConnector {
     player.seekTo(mediaItemIndex, positionMs);
   }
 
-  private static int getMediaSessionPlaybackState(
+  private int getMediaSessionPlaybackState(
       @Player.State int exoPlayerPlaybackState, boolean playWhenReady) {
     switch (exoPlayerPlaybackState) {
       case Player.STATE_BUFFERING:
@@ -997,7 +1007,9 @@ public final class MediaSessionConnector {
         return PlaybackStateCompat.STATE_STOPPED;
       case Player.STATE_IDLE:
       default:
-        return PlaybackStateCompat.STATE_NONE;
+        return mapIdleToStopped
+            ? PlaybackStateCompat.STATE_STOPPED
+            : PlaybackStateCompat.STATE_NONE;
     }
   }