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

Commit 73306e72 authored by Robert Shih's avatar Robert Shih Committed by Automerger Merge Worker
Browse files

Merge "libmediadrm: use AServiceManager_waitForService for lazy HALs" into tm-dev am: ba3970d2 

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

Change-Id: Iba8689ec2b3893e0d13a231404220f9cb34949ef
parents d1f73fe6 ba3970d2

drm/libmediadrm/DrmUtils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ std::vector<std::shared_ptr<IDrmFactoryAidl>> makeDrmFactoriesAidl() { 
        [](const char* instance, void* context) {

            auto fullName = std::string(IDrmFactoryAidl::descriptor) + "/" + std::string(instance);

            auto factory = IDrmFactoryAidl::fromBinder(

                    ::ndk::SpAIBinder(AServiceManager_getService(fullName.c_str())));

                    ::ndk::SpAIBinder(AServiceManager_waitForService(fullName.c_str())));

            if (factory == nullptr) {

                ALOGE("not found IDrmFactory. Instance name:[%s]", fullName.c_str());

                return;