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 "Change drm/crypto service names to "default"" into oc-dev

Browse Source 
am: 8eb3a1ea59

Change-Id: I942fa45af11ff966c41fd61482dde34e5828cc36
This commit is contained in:
Jeff Tinker
2017-04-13 02:34:20 +00:00
committed by android-build-merger
parent 77d1987496 8eb3a1ea59
commit 94c3beecfc
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drm/1.0/default/service.cpp
View File

@@ -32,11 +32,11 @@ int main() {
ALOGD("android.hardware.drm@1.0-service starting...");
configureRpcThreadpool(8, true /* callerWillJoin */);
android::status_t status =
registerPassthroughServiceImplementation<IDrmFactory>("drm");
registerPassthroughServiceImplementation<IDrmFactory>();
LOG_ALWAYS_FATAL_IF(
status != android::OK,
"Error while registering drm service: %d", status);
status = registerPassthroughServiceImplementation<ICryptoFactory>("crypto");
status = registerPassthroughServiceImplementation<ICryptoFactory>();
LOG_ALWAYS_FATAL_IF(
status != android::OK,
"Error while registering crypto service: %d", status);

6
drm/1.0/vts/functional/drm_hal_clearkey_test.cpp
View File

@@ -94,12 +94,10 @@ class DrmHalClearkeyFactoryTest : public ::testing::VtsHalHidlTargetTestBase {
test_info->name());
drmFactory =
::testing::VtsHalHidlTargetTestBase::getService<IDrmFactory>(
"drm");
::testing::VtsHalHidlTargetTestBase::getService<IDrmFactory>();
ASSERT_NE(drmFactory, nullptr);
cryptoFactory =
::testing::VtsHalHidlTargetTestBase::getService<ICryptoFactory>(
"crypto");
::testing::VtsHalHidlTargetTestBase::getService<ICryptoFactory>();
ASSERT_NE(cryptoFactory, nullptr);
}

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

@@ -114,14 +114,14 @@ class DrmHalVendorFactoryTest : public testing::TestWithParam<std::string> {
string name = vendorModule->getServiceName();
drmFactory = VtsTestBase::getService<IDrmFactory>(name);
if (drmFactory == nullptr) {
drmFactory = VtsTestBase::getService<IDrmFactory>("drm");
drmFactory = VtsTestBase::getService<IDrmFactory>();
}
ASSERT_NE(drmFactory, nullptr);
// Dot the same for the crypto factory
// Do the same for the crypto factory
cryptoFactory = VtsTestBase::getService<ICryptoFactory>(name);
if (cryptoFactory == nullptr) {
VtsTestBase::getService<ICryptoFactory>("crypto");
VtsTestBase::getService<ICryptoFactory>();
}
ASSERT_NE(cryptoFactory, nullptr);
}