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

Commit 7faba5ea authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change drm/crypto service names to "default"" into oc-dev

parents bc942724 e309b22b

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