From b82f3410074cbecbfb915706b5000a8a1dfc68c8 Mon Sep 17 00:00:00 2001 From: Ian Baker Date: Tue, 13 Feb 2024 17:11:03 +0000 Subject: [PATCH] In-line DashTestRunner.MediaDrmBuilder --- .../playback/gts/DashTestRunner.java | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/libraries/test_exoplayer_playback/src/androidTest/java/androidx/media3/test/exoplayer/playback/gts/DashTestRunner.java b/libraries/test_exoplayer_playback/src/androidTest/java/androidx/media3/test/exoplayer/playback/gts/DashTestRunner.java index b4061ae1a9..3a3a6a3a32 100644 --- a/libraries/test_exoplayer_playback/src/androidTest/java/androidx/media3/test/exoplayer/playback/gts/DashTestRunner.java +++ b/libraries/test_exoplayer_playback/src/androidTest/java/androidx/media3/test/exoplayer/playback/gts/DashTestRunner.java @@ -105,17 +105,15 @@ import java.util.List; @SuppressWarnings("ResourceType") public static boolean isL1WidevineAvailable(String mimeType) { - try { + try (MediaDrm mediaDrm = new MediaDrm(WIDEVINE_UUID)) { // Force L3 if secure decoder is not available. if (MediaCodecUtil.getDecoderInfo(mimeType, /* secure= */ true, /* tunneling= */ false) == null) { return false; } - MediaDrm mediaDrm = MediaDrmBuilder.build(); String securityProperty = mediaDrm.getPropertyString(SECURITY_LEVEL_PROPERTY); - mediaDrm.release(); return WIDEVINE_SECURITY_LEVEL_1.equals(securityProperty); - } catch (MediaCodecUtil.DecoderQueryException e) { + } catch (UnsupportedSchemeException | MediaCodecUtil.DecoderQueryException e) { throw new IllegalStateException(e); } } @@ -503,19 +501,4 @@ import java.util.List; return RendererCapabilities.getFormatSupport(formatSupport) == C.FORMAT_HANDLED; } } - - /** - * Creates a new {@code MediaDrm} object. The encapsulation ensures that the tests can be executed - * for API level < 18. - */ - private static final class MediaDrmBuilder { - - public static MediaDrm build() { - try { - return new MediaDrm(WIDEVINE_UUID); - } catch (UnsupportedSchemeException e) { - throw new IllegalStateException(e); - } - } - } }