Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c7cdd0c authored by Shubhangi Pawar's avatar Shubhangi Pawar Committed by Automerger Merge Worker
Browse files

Merge "drm aidl vts: proper skip tests without vendor module" into... 

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

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



Change-Id: If22997fbe6ed529d52cebcb54a436d9b76cffa36
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aab602a1 de820c8d

drm/aidl/vts/drm_hal_common.cpp

+6 −6
Original line number Diff line number Diff line
@@ -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();