summaryrefslogtreecommitdiffstats
path: root/drm
diff options
context:
space:
mode:
authorzhangweiwei <zhangweiwei.zhangweiwei@huawei.com>2019-06-24 17:50:23 +0800
committerJeff Tinker <jtinker@google.com>2019-07-17 23:24:56 +0000
commit0a50473369f4d03b254f34b763c13989ba1b9909 (patch)
treec7cbe232c259327cb3a1ca1a89a125546b8ba726 /drm
parent65945cfb150ee6f046daa472b4ce71729ee69f1b (diff)
downloadplatform_hardware_interfaces-0a50473369f4d03b254f34b763c13989ba1b9909.tar.gz
platform_hardware_interfaces-0a50473369f4d03b254f34b763c13989ba1b9909.tar.bz2
platform_hardware_interfaces-0a50473369f4d03b254f34b763c13989ba1b9909.zip
Adapt change clearkey to Lazy hal
Exempt-From-Owner-Approval Bug:135896867 Test: vts-tradefed run commandAndExit vts-staging-default -m VtsHalDrmV1_1Target Change-Id: Iadba7a7afdccfe8a6299e3c0e1e03f63a58c5ca8
Diffstat (limited to 'drm')
-rw-r--r--drm/1.1/vts/functional/drm_hal_clearkey_test.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/drm/1.1/vts/functional/drm_hal_clearkey_test.cpp b/drm/1.1/vts/functional/drm_hal_clearkey_test.cpp
index 7dedd7f0b9..6be30d34df 100644
--- a/drm/1.1/vts/functional/drm_hal_clearkey_test.cpp
+++ b/drm/1.1/vts/functional/drm_hal_clearkey_test.cpp
@@ -24,7 +24,7 @@
#include <android/hardware/drm/1.0/types.h>
#include <android/hardware/drm/1.1/types.h>
#include <android/hidl/allocator/1.0/IAllocator.h>
-#include <android/hidl/manager/1.0/IServiceManager.h>
+#include <android/hidl/manager/1.2/IServiceManager.h>
#include <gtest/gtest.h>
#include <hidl/HidlSupport.h>
#include <hidl/ServiceManagement.h>
@@ -129,9 +129,9 @@ public:
ALOGD("DrmHalClearkeyTest: Running test %s.%s", test_info->test_case_name(),
test_info->name());
- auto manager = android::hardware::defaultServiceManager();
+ auto manager = android::hardware::defaultServiceManager1_2();
ASSERT_NE(nullptr, manager.get());
- manager->listByInterface(IDrmFactory::descriptor,
+ manager->listManifestByInterface(IDrmFactory::descriptor,
[&](const hidl_vec<hidl_string> &registered) {
for (const auto &instance : registered) {
sp<IDrmFactory> drmFactory =
@@ -144,7 +144,7 @@ public:
}
);
- manager->listByInterface(ICryptoFactory::descriptor,
+ manager->listManifestByInterface(ICryptoFactory::descriptor,
[&](const hidl_vec<hidl_string> &registered) {
for (const auto &instance : registered) {
sp<ICryptoFactory> cryptoFactory =