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

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

Merge "Fix mediadrmserver not finding IServiceManager instance"

parents a7ddf89b 6a4921ae

drm/libmediadrm/CryptoHal.cpp

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

    Vector<sp<ICryptoFactory>> factories;



    auto manager = ::IServiceManager::getService("manager");

    auto manager = ::IServiceManager::getService();

    if (manager != NULL) {

        manager->listByInterface(ICryptoFactory::descriptor,

                [&factories](const hidl_vec<hidl_string> &registered) {

drm/libmediadrm/DrmHal.cpp

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

    Vector<sp<IDrmFactory>> factories;



    auto manager = ::IServiceManager::getService("manager");

    auto manager = ::IServiceManager::getService();



    if (manager != NULL) {

        manager->listByInterface(IDrmFactory::descriptor,