commit 3874c11b94eadea3cf8c7f9940fc09936ec6f5fc
author Kyle Zhang <kelzhan@google.com> Fri Dec 20 14:18:22 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 20 14:18:22 2024 -0800
tree 1d215d76585e280af57f4a841e173d45af5bbdf0
parent 51769c2ed4e3d74440feb4047fc53b27376bb499
parent 3d84ccf8a29714d23ec1c15456bba454e1138b77

Merge "Fix force L3 preference unit test" into main

tests/unit/src/com/android/settings/development/mediadrm/ForceSwSecureCryptoFallbackPreferenceControllerTest.java

diff --git a/tests/unit/src/com/android/settings/development/mediadrm/ForceSwSecureCryptoFallbackPreferenceControllerTest.java b/tests/unit/src/com/android/settings/development/mediadrm/ForceSwSecureCryptoFallbackPreferenceControllerTest.java
index 5eb76f1..5482b41 100644
--- a/tests/unit/src/com/android/settings/development/mediadrm/ForceSwSecureCryptoFallbackPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/development/mediadrm/ForceSwSecureCryptoFallbackPreferenceControllerTest.java
@@ -69,7 +69,11 @@
     @Test
     @EnableFlags(Flags.FLAG_FORCE_L3_ENABLED)
     public void updateState_flagEnabled_checkPreference() {
-        mController.updateState(mPreference);
+        try (MediaDrm drm = new MediaDrm(WIDEVINE_UUID)) {
+            mController.updateState(mPreference);
+        } catch (UnsupportedSchemeException ex) {
+            assumeNoException(ex);
+        }
         assertThat(mPreference.isEnabled()).isTrue();
         assertThat(mPreference.isChecked()).isFalse();
         assertThat(WidevineProperties.forcel3_enabled().orElse(false)).isFalse();