Skip to content

Commit

Permalink
Adapt change clearkey to Lazy hal
Browse files Browse the repository at this point in the history
Exempt-From-Owner-Approval

Bug:135896867
Test: vts-tradefed run commandAndExit vts-staging-default -m VtsHalDrmV1_1Target

Change-Id: Iadba7a7afdccfe8a6299e3c0e1e03f63a58c5ca8
  • Loading branch information
zhangweiwei authored and jefftinker committed Jul 17, 2019
1 parent 65945cf commit 0a50473
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drm/1.1/vts/functional/drm_hal_clearkey_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -129,9 +129,9 @@ class DrmHalClearkeyTest : public ::testing::VtsHalHidlTargetTestBase {
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 =
Expand All @@ -144,7 +144,7 @@ class DrmHalClearkeyTest : public ::testing::VtsHalHidlTargetTestBase {
}
);

manager->listByInterface(ICryptoFactory::descriptor,
manager->listManifestByInterface(ICryptoFactory::descriptor,
[&](const hidl_vec<hidl_string> &registered) {
for (const auto &instance : registered) {
sp<ICryptoFactory> cryptoFactory =
Expand Down

0 comments on commit 0a50473

Please sign in to comment.