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

Commit 3855688c authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

Merge "Change drm/crypto service names to "default"" into oc-dev am: 7faba5ea 

am: 1ad732ba

Change-Id: Ibe394dea0abbcd352918cdfb874999ab55736b2e
parents 387bbe4b 1ad732ba

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