tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "drm aidl vts: proper skip tests without vendor module" into android13-tests-dev am: 05f5fd842d am: de820c8d7c

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2379389

Change-Id: Ia61c42ae7bfa09f48774016dfa43496ae034b34d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shubhangi Pawar 2023-01-26 05:08:04 +00:00 committed by Automerger Merge Worker
commit db9c1fdc6f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drm/aidl/vts/drm_hal_common.cpp
View file

@ -187,6 +187,12 @@ void DrmHalTest::SetUp() {
auto svc = GetParamService();
const string drmInstance = HalFullName(kDrmIface, svc);
if (!vendorModule) {
ASSERT_NE(drmInstance, HalFullName(kDrmIface, "widevine")) << "Widevine requires vendor module.";
ASSERT_NE(drmInstance, HalFullName(kDrmIface, "clearkey")) << "Clearkey requires vendor module.";
GTEST_SKIP() << "No vendor module installed";
}
if (drmInstance.find("IDrmFactory") != std::string::npos) {
drmFactory = IDrmFactory::fromBinder(
::ndk::SpAIBinder(AServiceManager_waitForService(drmInstance.c_str())));
@ -195,12 +201,6 @@ void DrmHalTest::SetUp() {
cryptoPlugin = createCryptoPlugin();
}
if (!vendorModule) {
ASSERT_NE(drmInstance, "widevine") << "Widevine requires vendor module.";
ASSERT_NE(drmInstance, "clearkey") << "Clearkey requires vendor module.";
GTEST_SKIP() << "No vendor module installed";
}
ASSERT_EQ(HalBaseName(drmInstance), vendorModule->getServiceName());
contentConfigurations = vendorModule->getContentConfigurations();