From ae0aeb046b11cc21a2f8470f5eb2f6cb211a0e1e Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Thu, 27 Jun 2019 21:51:41 +0100
Subject: [PATCH] call setPlayWhenReady in any case

ISSUE: #6093
PiperOrigin-RevId: 255471282
---
 .../exoplayer2/ext/mediasession/MediaSessionConnector.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 9ec3886df5..eaebf8b4e1 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
@@ -1089,8 +1089,9 @@ public final class MediaSessionConnector {
           }
         } else if (player.getPlaybackState() == Player.STATE_ENDED) {
           controlDispatcher.dispatchSeekTo(player, player.getCurrentWindowIndex(), C.TIME_UNSET);
-          controlDispatcher.dispatchSetPlayWhenReady(player, /* playWhenReady= */ true);
         }
+        controlDispatcher.dispatchSetPlayWhenReady(
+            Assertions.checkNotNull(player), /* playWhenReady= */ true);
       }
     }