From b2bc4450df84c8c6f6720a508dc08d5249761886 Mon Sep 17 00:00:00 2001 From: aquilescanta Date: Fri, 15 Sep 2017 07:51:51 -0700 Subject: [PATCH] Run cbc1/cbcs tests from API 25 onwards ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=168834998 --- .../playbacktests/gts/CommonEncryptionDrmTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/CommonEncryptionDrmTest.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/CommonEncryptionDrmTest.java index c6dd72debd..15acae96fd 100644 --- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/CommonEncryptionDrmTest.java +++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/CommonEncryptionDrmTest.java @@ -74,7 +74,9 @@ public final class CommonEncryptionDrmTest extends ActivityInstrumentationTestCa } public void testCbc1SchemeType() { - if (Util.SDK_INT < 24) { + if (Util.SDK_INT < 25) { + // cbc1 support was added in API 24, but it is stable from API 25 onwards. + // See [internal: b/65634809]. // Pass. return; } @@ -82,7 +84,9 @@ public final class CommonEncryptionDrmTest extends ActivityInstrumentationTestCa } public void testCbcsSchemeType() { - if (Util.SDK_INT < 24) { + if (Util.SDK_INT < 25) { + // cbcs support was added in API 24, but it is stable from API 25 onwards. + // See [internal: b/65634809]. // Pass. return; }