diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-01-16 01:08:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-01-16 01:08:45 +0000 |
| commit | 020d1b52530555553059fd30939bd13c458f7188 (patch) | |
| tree | 7b28240a96cff7f520cf0a3672aeb5bd78d39141 /drm | |
| parent | a5d726d37a163fa02f1c96a9c97fe9651a22630e (diff) | |
| parent | ca5642cd9ccd95cae88dd9204958419e279ea532 (diff) | |
| download | frameworks_av-020d1b52530555553059fd30939bd13c458f7188.tar.gz frameworks_av-020d1b52530555553059fd30939bd13c458f7188.tar.bz2 frameworks_av-020d1b52530555553059fd30939bd13c458f7188.zip | |
Merge "List drm HALs from manifest"
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/libmediadrm/DrmHal.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drm/libmediadrm/DrmHal.cpp b/drm/libmediadrm/DrmHal.cpp index fc847ff72f..f4c0341722 100644 --- a/drm/libmediadrm/DrmHal.cpp +++ b/drm/libmediadrm/DrmHal.cpp @@ -24,7 +24,7 @@ #include <binder/IServiceManager.h> #include <android/hardware/drm/1.2/types.h> -#include <android/hidl/manager/1.0/IServiceManager.h> +#include <android/hidl/manager/1.2/IServiceManager.h> #include <hidl/ServiceManagement.h> #include <media/EventMetric.h> @@ -353,10 +353,10 @@ void DrmHal::cleanup() { Vector<sp<IDrmFactory>> DrmHal::makeDrmFactories() { Vector<sp<IDrmFactory>> factories; - auto manager = hardware::defaultServiceManager(); + auto manager = hardware::defaultServiceManager1_2(); if (manager != NULL) { - manager->listByInterface(drm::V1_0::IDrmFactory::descriptor, + manager->listManifestByInterface(drm::V1_0::IDrmFactory::descriptor, [&factories](const hidl_vec<hidl_string> ®istered) { for (const auto &instance : registered) { auto factory = drm::V1_0::IDrmFactory::getService(instance); @@ -366,7 +366,7 @@ Vector<sp<IDrmFactory>> DrmHal::makeDrmFactories() { } } ); - manager->listByInterface(drm::V1_1::IDrmFactory::descriptor, + manager->listManifestByInterface(drm::V1_1::IDrmFactory::descriptor, [&factories](const hidl_vec<hidl_string> ®istered) { for (const auto &instance : registered) { auto factory = drm::V1_1::IDrmFactory::getService(instance); |