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

Commit 583d7283 authored by Steven Moreland's avatar Steven Moreland Committed by Android (Google) Code Review
Browse files

Merge "listByInterface -> listManifestByInterface"

parents da97100a 7dcb4db0

drm/libmediadrm/CryptoHal.cpp

+5 −6
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
#include <utils/Log.h>



#include <android/hardware/drm/1.0/types.h>

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



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

#include <binder/IMemory.h>

#include <hidl/ServiceManagement.h>

#include <hidlmemory/FrameworkUtils.h>

#include <media/hardware/CryptoAPI.h>

#include <media/stagefright/foundation/ADebug.h>
@@ -47,7 +47,6 @@ using ::android::hardware::hidl_string; 
using ::android::hardware::hidl_vec;

using ::android::hardware::Return;

using ::android::hardware::Void;

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

using ::android::sp;



typedef drm::V1_2::Status Status_V1_2;
@@ -129,9 +128,9 @@ CryptoHal::~CryptoHal() { 
Vector<sp<ICryptoFactory>> CryptoHal::makeCryptoFactories() {

    Vector<sp<ICryptoFactory>> factories;



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

    auto manager = hardware::defaultServiceManager1_2();

    if (manager != NULL) {

        manager->listByInterface(drm::V1_0::ICryptoFactory::descriptor,

        manager->listManifestByInterface(drm::V1_0::ICryptoFactory::descriptor,

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

                    for (const auto &instance : registered) {

                        auto factory = drm::V1_0::ICryptoFactory::getService(instance);
@@ -142,7 +141,7 @@ Vector<sp<ICryptoFactory>> CryptoHal::makeCryptoFactories() { 
                    }

                }

            );

        manager->listByInterface(drm::V1_1::ICryptoFactory::descriptor,

        manager->listManifestByInterface(drm::V1_1::ICryptoFactory::descriptor,

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

                    for (const auto &instance : registered) {

                        auto factory = drm::V1_1::ICryptoFactory::getService(instance);

drm/libmediadrm/DrmHal.cpp

+1 −3
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <android/hardware/drm/1.2/types.h>

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

#include <hidl/ServiceManagement.h>



#include <media/EventMetric.h>

#include <media/PluginMetricsReporting.h>

#include <media/drm/DrmAPI.h>
@@ -57,7 +56,6 @@ using ::android::hardware::hidl_string; 
using ::android::hardware::hidl_vec;

using ::android::hardware::Return;

using ::android::hardware::Void;

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

using ::android::os::PersistableBundle;

using ::android::sp;
@@ -394,7 +392,7 @@ Vector<sp<IDrmFactory>> DrmHal::makeDrmFactories() { 
                    }

                }

            );

        manager->listByInterface(drm::V1_2::IDrmFactory::descriptor,

        manager->listManifestByInterface(drm::V1_2::IDrmFactory::descriptor,

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

                    for (const auto &instance : registered) {

                        auto factory = drm::V1_2::IDrmFactory::getService(instance);