From 07f66ea469fe7ba513c958fd6fab4aac86b1a3f5 Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Fri, 14 Feb 2020 12:16:19 +0000 Subject: [PATCH] Fix NewApi error for DummySurface usage API level >= 17 is guaranteed by shouldUseDummySurface returning true, but Android Studio shows a warning anyway. PiperOrigin-RevId: 295118491 --- .../com/google/android/exoplayer2/video/DummySurface.java | 7 ------- .../android/exoplayer2/video/MediaCodecVideoRenderer.java | 4 +++- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/DummySurface.java b/library/core/src/main/java/com/google/android/exoplayer2/video/DummySurface.java index 4c7c212a79..c9dae2d280 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/video/DummySurface.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/video/DummySurface.java @@ -80,7 +80,6 @@ public final class DummySurface extends Surface { * {@link #isSecureSupported(Context)} returns {@code false}. */ public static DummySurface newInstanceV17(Context context, boolean secure) { - assertApiLevel17OrHigher(); Assertions.checkState(!secure || isSecureSupported(context)); DummySurfaceThread thread = new DummySurfaceThread(); return thread.init(secure ? secureMode : SECURE_MODE_NONE); @@ -107,12 +106,6 @@ public final class DummySurface extends Surface { } } - private static void assertApiLevel17OrHigher() { - if (Util.SDK_INT < 17) { - throw new UnsupportedOperationException("Unsupported prior to API level 17"); - } - } - @SecureMode private static int getSecureMode(Context context) { if (GlUtil.isProtectedContentExtensionSupported(context)) { diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java index cf1a995c33..8748fbc16b 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java @@ -641,7 +641,9 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { deviceNeedsNoPostProcessWorkaround, tunnelingAudioSessionId); if (surface == null) { - Assertions.checkState(shouldUseDummySurface(codecInfo)); + if (!shouldUseDummySurface(codecInfo)) { + throw new IllegalStateException(); + } if (dummySurface == null) { dummySurface = DummySurface.newInstanceV17(context, codecInfo.secure); }