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

Commit 1b0fcdd3 authored by Juju Sung's avatar Juju Sung Committed by Automerger Merge Worker
Browse files

Support drm lazy hal am: a4cfeca6 am: b6990775 

Change-Id: Ic747c7e164ed949976adca7b6cfc36b67a7d266f
parents d033a1df b6990775

drm/libmediadrm/DrmUtils.cpp

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <android/hardware/drm/1.2/IDrmFactory.h>

#include <android/hardware/drm/1.3/ICryptoFactory.h>

#include <android/hardware/drm/1.3/IDrmFactory.h>

#include <android/hidl/manager/1.0/IServiceManager.h>

#include <android/hidl/manager/1.2/IServiceManager.h>

#include <hidl/HidlSupport.h>



#include <utils/Errors.h>
@@ -41,7 +41,7 @@ 
#include <mediadrm/ICrypto.h>

#include <mediadrm/IDrm.h>



using HServiceManager = ::android::hidl::manager::V1_0::IServiceManager;

using HServiceManager = ::android::hidl::manager::V1_2::IServiceManager;

using ::android::hardware::hidl_array;

using ::android::hardware::hidl_string;

using ::android::hardware::hidl_vec;
@@ -72,7 +72,7 @@ void MakeHidlFactories(const uint8_t uuid[16], V &factories) { 
        exit(-1);

    }



    serviceManager->listByInterface(Hal::descriptor, [&](const hidl_vec<hidl_string> &registered) {

    serviceManager->listManifestByInterface(Hal::descriptor, [&](const hidl_vec<hidl_string> &registered) {

        for (const auto &instance : registered) {

            auto factory = Hal::getService(instance);

            if (factory != nullptr) {