Merge pull request #7367 from inv3rse:keep-paused-state-during-buffering

PiperOrigin-RevId: 311623784

RELEASENOTES.md

@@ -29,6 +29,9 @@
     Services rather than Cronet Embedded. This allows Cronet to be used with a
     Services rather than Cronet Embedded. This allows Cronet to be used with a
     negligible increase in application size, compared to approximately 8MB when
     negligible increase in application size, compared to approximately 8MB when
     embedding the library.
     embedding the library.
+*   MediaSession extension: Set session playback state to BUFFERING only when
+    actually playing ([#7367](https://github.com/google/ExoPlayer/pull/7367),
+    [#7206](https://github.com/google/ExoPlayer/issues/7206)).
 *   DownloadService: Fix "Not allowed to start service" `IllegalStateException`.
 *   DownloadService: Fix "Not allowed to start service" `IllegalStateException`.
 
 
 ### 2.11.4 (2020-04-08) ###
 ### 2.11.4 (2020-04-08) ###

extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java

@@ -987,7 +987,9 @@ public final class MediaSessionConnector {
       @Player.State int exoPlayerPlaybackState, boolean playWhenReady) {
       @Player.State int exoPlayerPlaybackState, boolean playWhenReady) {
     switch (exoPlayerPlaybackState) {
     switch (exoPlayerPlaybackState) {
       case Player.STATE_BUFFERING:
       case Player.STATE_BUFFERING:
-        return PlaybackStateCompat.STATE_BUFFERING;
+        return playWhenReady
+            ? PlaybackStateCompat.STATE_BUFFERING
+            : PlaybackStateCompat.STATE_PAUSED;
       case Player.STATE_READY:
       case Player.STATE_READY:
         return playWhenReady ? PlaybackStateCompat.STATE_PLAYING : PlaybackStateCompat.STATE_PAUSED;
         return playWhenReady ? PlaybackStateCompat.STATE_PLAYING : PlaybackStateCompat.STATE_PAUSED;
       case Player.STATE_ENDED:
       case Player.STATE_ENDED: