Merge "Restore crypto scheme check." into pi-dev

2 files changed, 8 insertions, 4 deletions

diff --git a/tests/tests/media/src/android/media/cts/MediaDrmClearkeyTest.java b/tests/tests/media/src/android/media/cts/MediaDrmClearkeyTest.java
index efb32738ad8..9e7887864f5 100644
--- a/tests/tests/media/src/android/media/cts/MediaDrmClearkeyTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaDrmClearkeyTest.java
@@ -234,6 +234,10 @@ public class MediaDrmClearkeyTest extends MediaPlayerTestBase {
     }
 
     private @NonNull MediaDrm startDrm(final byte[][] clearKeys, final String initDataType, final UUID drmSchemeUuid) {
+        if (!MediaDrm.isCryptoSchemeSupported(drmSchemeUuid)) {
+            throw new Error(ERR_MSG_CRYPTO_SCHEME_NOT_SUPPORTED);
+        }
+
         new Thread() {
             @Override
             public void run() {
@@ -365,10 +369,6 @@ public class MediaDrmClearkeyTest extends MediaPlayerTestBase {
         mSessionId = null;
         if (!scrambled) {
             drm = startDrm(clearKeys, initDataType, drmSchemeUuid);
-            if (!drm.isCryptoSchemeSupported(drmSchemeUuid)) {
-                stopDrm(drm);
-                throw new Error(ERR_MSG_CRYPTO_SCHEME_NOT_SUPPORTED);
-            }
             mSessionId = openSession(drm);
         }
 
diff --git a/tests/tests/media/src/android/media/cts/NativeMediaDrmClearkeyTest.java b/tests/tests/media/src/android/media/cts/NativeMediaDrmClearkeyTest.java
index ae61f5b7616..b1790b53056 100644
--- a/tests/tests/media/src/android/media/cts/NativeMediaDrmClearkeyTest.java
+++ b/tests/tests/media/src/android/media/cts/NativeMediaDrmClearkeyTest.java
@@ -211,6 +211,10 @@ public class NativeMediaDrmClearkeyTest extends MediaPlayerTestBase {
             return;
         }
 
+        if (!isCryptoSchemeSupportedNative(uuidByteArray(drmSchemeUuid))) {
+            throw new Error("Crypto scheme is not supported.");
+        }
+
         IConnectionStatus connectionStatus = new ConnectionStatus(mContext);
         if (!connectionStatus.isAvailable()) {
             throw new Error("Network is not available, reason: " +