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

Commit e309b22b authored by Jeff Tinker's avatar Jeff Tinker
Browse files

Change drm/crypto service names to "default" 

bug: 36371166

Test: vts drm hidl test, Play Movies

Change-Id: I942f91ab0be1f237017e88910f8d3738bf54447f
parent 8d8ebcaa

drm/libmediadrm/CryptoHal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ Vector<sp<ICryptoFactory>> CryptoHal::makeCryptoFactories() { 


    if (factories.size() == 0) {

        // must be in passthrough mode, load the default passthrough service

        auto passthrough = ICryptoFactory::getService("crypto");

        auto passthrough = ICryptoFactory::getService();

        if (passthrough != NULL) {

            ALOGI("makeCryptoFactories: using default crypto instance");

            factories.push_back(passthrough);

drm/libmediadrm/DrmHal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ Vector<sp<IDrmFactory>> DrmHal::makeDrmFactories() { 


    if (factories.size() == 0) {

        // must be in passthrough mode, load the default passthrough service

        auto passthrough = IDrmFactory::getService("drm");

        auto passthrough = IDrmFactory::getService();

        if (passthrough != NULL) {

            ALOGI("makeDrmFactories: using default drm instance");

            factories.push_back(passthrough);