commit 621af3e560c75f3f3b09f334c72980302b42b771
author Kyle Zhang <kelzhan@google.com> Thu Mar 17 23:39:05 2022 +0000
committer Kyle Zhang <kelzhan@google.com> Fri Mar 18 19:43:10 2022 +0000
tree 8f11ab1b8d32dd590c5e770cfcfd45daefa58d71
parent c79530b4e082e54d2b9a1d9c30cb4ae7a1fc67b5

Change getSupportedCryptoSchemesNative to use getSupportedSchemes

Bug: 225064675
Test: CtsMediaDrmFrameworkTestCases
Change-Id: I2461e17f5e97e58110b6e2a56cd699496ef253eb

media/jni/android_media_MediaDrm.cpp

diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp
index 4f7b711..2f4dd8f 100644
--- a/media/jni/android_media_MediaDrm.cpp
+++ b/media/jni/android_media_MediaDrm.cpp
@@ -1003,19 +1003,9 @@
 }
 
 static jbyteArray android_media_MediaDrm_getSupportedCryptoSchemesNative(JNIEnv *env) {
+    sp<IDrm> drm = android::DrmUtils::MakeDrm();
     std::vector<uint8_t> bv;
-    for (auto &factory : DrmUtils::MakeDrmFactories()) {
-        sp<drm::V1_3::IDrmFactory> factoryV1_3 = drm::V1_3::IDrmFactory::castFrom(factory);
-        if (factoryV1_3 == nullptr) {
-            continue;
-        }
-        factoryV1_3->getSupportedCryptoSchemes(
-            [&](const hardware::hidl_vec<hardware::hidl_array<uint8_t, 16>>& schemes) {
-                for (const auto &scheme : schemes) {
-                    bv.insert(bv.end(), scheme.data(), scheme.data() + scheme.size());
-                }
-            });
-    }
+    drm->getSupportedSchemes(bv);
 
     jbyteArray jUuidBytes = env->NewByteArray(bv.size());
     env->SetByteArrayRegion(jUuidBytes, 0, bv.size(), reinterpret_cast<const jbyte *>(bv.data()));