Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Support binderized and passthrough vendor services" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-10 22:14:19 +00:00
committed by Android (Google) Code Review
parent eeee2b1d50 cf3916a1fd
commit 25197f0f6f
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drm/1.0/vts/functional/drm_hal_vendor_test.cpp
View File

@@ -78,6 +78,7 @@ using std::vector;
using ContentConfiguration = ::DrmHalVTSVendorModule_V1::ContentConfiguration;
using Key = ::DrmHalVTSVendorModule_V1::ContentConfiguration::Key;
using VtsTestBase = ::testing::VtsHalHidlTargetTestBase;
#define ASSERT_OK(ret) ASSERT_TRUE(ret.isOk())
#define EXPECT_OK(ret) EXPECT_TRUE(ret.isOk())
@@ -106,14 +107,22 @@ class DrmHalVendorFactoryTest : public testing::TestWithParam<std::string> {
GetParam().c_str());
ASSERT_NE(vendorModule, nullptr);
// First try the binderized service name provided by the vendor module.
// If that fails, which it can on non-binderized devices, try the default
// service.
string name = vendorModule->getServiceName();
drmFactory =
::testing::VtsHalHidlTargetTestBase::getService<IDrmFactory>(
name != "default" ? name : "drm");
drmFactory = VtsTestBase::getService<IDrmFactory>(name);
if (drmFactory == nullptr) {
drmFactory = VtsTestBase::getService<IDrmFactory>("drm");
}
ASSERT_NE(drmFactory, nullptr);
cryptoFactory =
::testing::VtsHalHidlTargetTestBase::getService<ICryptoFactory>(
name != "default" ? name : "crypto");
// Dot the same for the crypto factory
cryptoFactory = VtsTestBase::getService<ICryptoFactory>(name);
if (cryptoFactory == nullptr) {
VtsTestBase::getService<ICryptoFactory>("crypto");
}
ASSERT_NE(cryptoFactory, nullptr);
}