From 883b3c8783468e98108581d3d0f284f514c81cde Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 24 Jun 2019 18:13:31 +0100
Subject: [PATCH] Update isMediaCodecException to return true for generic ISE
 on API 21+ if the stack trace contains MediaCodec.

PiperOrigin-RevId: 254781909
---
 .../android/exoplayer2/mediacodec/MediaCodecRenderer.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index ef3cb0bbe3..30083cb849 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -1743,8 +1743,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   }
 
   private static boolean isMediaCodecException(IllegalStateException error) {
-    if (Util.SDK_INT >= 21) {
-      return isMediaCodecExceptionV21(error);
+    if (Util.SDK_INT >= 21 && isMediaCodecExceptionV21(error)) {
+      return true;
     }
     StackTraceElement[] stackTrace = error.getStackTrace();
     return stackTrace.length > 0 && stackTrace[0].getClassName().equals("android.media.MediaCodec");