Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 028b5367 authored by Kyle Zhang's avatar Kyle Zhang Committed by Automerger Merge Worker
Browse files

Merge "Change getSupportedCryptoSchemesNative to use getSupportedSchemes" into... 

Merge "Change getSupportedCryptoSchemesNative to use getSupportedSchemes" into tm-dev am: 8b7f3117

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17246443

Change-Id: I42f90bc68e99f40925a6062458c088c3070e5f1a
parents 51483569 8b7f3117

media/jni/android_media_MediaDrm.cpp

+2 −12
Original line number Diff line number Diff line
@@ -1003,19 +1003,9 @@ DrmPlugin::SecurityLevel jintToSecurityLevel(jint jlevel) { 
}



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()));