Don't fail the test if descrambler isn't supported since R.
bug: 177664366
Test: atest -c MediaCasTest
Change-Id: Iea65a678fb8055337bf114ea0737e01536c67cd2
diff --git a/tests/tests/media/src/android/media/cts/MediaCasTest.java b/tests/tests/media/src/android/media/cts/MediaCasTest.java
index 66902cb..7f1c1c7 100644
--- a/tests/tests/media/src/android/media/cts/MediaCasTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaCasTest.java
@@ -194,9 +194,17 @@
if (mediaCas == null) {
fail("Enumerated " + descriptors[i] + " but cannot instantiate MediaCas.");
}
- descrambler = new MediaDescrambler(CA_system_id);
- if (descrambler == null) {
- fail("Enumerated " + descriptors[i] + " but cannot instantiate MediaDescrambler.");
+ try {
+ descrambler = new MediaDescrambler(CA_system_id);
+ } catch (UnsupportedCasException e) {
+ // The descrambler can be supported through Tuner since R.
+ if (mIsAtLeastR) {
+ Log.d(TAG, "Enumerated "
+ + descriptors[i] + ", it doesn't support MediaDescrambler.");
+ } else {
+ fail("Enumerated " + descriptors[i]
+ + " but cannot instantiate MediaDescrambler.");
+ }
}
// Should always accept a listener (even if the plugin doesn't use it)
