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

Commit da4d0bcb authored by Robert Shih's avatar Robert Shih Committed by Gerrit Code Review
Browse files

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

parents c3a91077 d1b6beb1

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();