Make placeholder sessions report their true state

Note that the renderer changes will all disappear when we remove
legacy injection of DrmSessionManager into renderers.

PiperOrigin-RevId: 281952601

library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java

@@ -473,7 +473,9 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
   }
   }
 
 
   private boolean shouldWaitForKeys(boolean bufferEncrypted) throws ExoPlaybackException {
   private boolean shouldWaitForKeys(boolean bufferEncrypted) throws ExoPlaybackException {
-    if (decoderDrmSession == null || (!bufferEncrypted && playClearSamplesWithoutKeys)) {
+    if (decoderDrmSession == null
+        || (!bufferEncrypted
+            && (playClearSamplesWithoutKeys || decoderDrmSession.playClearSamplesWithoutKeys()))) {
       return false;
       return false;
     }
     }
     @DrmSession.State int drmSessionState = decoderDrmSession.getState();
     @DrmSession.State int drmSessionState = decoderDrmSession.getState();

library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java

@@ -356,7 +356,6 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
   @RequiresNonNull("sessionId")
   @RequiresNonNull("sessionId")
   private void doLicense(boolean allowRetry) {
   private void doLicense(boolean allowRetry) {
     if (isPlaceholderSession) {
     if (isPlaceholderSession) {
-      state = STATE_OPENED_WITH_KEYS;
       return;
       return;
     }
     }
     byte[] sessionId = Util.castNonNull(this.sessionId);
     byte[] sessionId = Util.castNonNull(this.sessionId);

library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java

@@ -77,13 +77,9 @@ public interface DrmSession<T extends ExoMediaCrypto> {
    * The session is being opened.
    * The session is being opened.
    */
    */
   int STATE_OPENING = 2;
   int STATE_OPENING = 2;
-  /**
-   * The session is open, but does not yet have the keys required for decryption.
-   */
+  /** The session is open, but does not have keys required for decryption. */
   int STATE_OPENED = 3;
   int STATE_OPENED = 3;
-  /**
-   * The session is open and has the keys required for decryption.
-   */
+  /** The session is open and has keys required for decryption. */
   int STATE_OPENED_WITH_KEYS = 4;
   int STATE_OPENED_WITH_KEYS = 4;
 
 
   /**
   /**

library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java

@@ -1191,7 +1191,9 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   }
   }
 
 
   private boolean shouldWaitForKeys(boolean bufferEncrypted) throws ExoPlaybackException {
   private boolean shouldWaitForKeys(boolean bufferEncrypted) throws ExoPlaybackException {
-    if (codecDrmSession == null || (!bufferEncrypted && playClearSamplesWithoutKeys)) {
+    if (codecDrmSession == null
+        || (!bufferEncrypted
+            && (playClearSamplesWithoutKeys || codecDrmSession.playClearSamplesWithoutKeys()))) {
       return false;
       return false;
     }
     }
     @DrmSession.State int drmSessionState = codecDrmSession.getState();
     @DrmSession.State int drmSessionState = codecDrmSession.getState();

library/core/src/main/java/com/google/android/exoplayer2/video/SimpleDecoderVideoRenderer.java

@@ -878,7 +878,9 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
   }
   }
 
 
   private boolean shouldWaitForKeys(boolean bufferEncrypted) throws ExoPlaybackException {
   private boolean shouldWaitForKeys(boolean bufferEncrypted) throws ExoPlaybackException {
-    if (decoderDrmSession == null || (!bufferEncrypted && playClearSamplesWithoutKeys)) {
+    if (decoderDrmSession == null
+        || (!bufferEncrypted
+            && (playClearSamplesWithoutKeys || decoderDrmSession.playClearSamplesWithoutKeys()))) {
       return false;
       return false;
     }
     }
     @DrmSession.State int drmSessionState = decoderDrmSession.getState();
     @DrmSession.State int drmSessionState = decoderDrmSession.getState();