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

Commit 8eb3a1ea authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change drm/crypto service names to "default"" into oc-dev

parents 1f8c6639 a0b44e64

drm/1.0/default/service.cpp

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

drm/1.0/vts/functional/drm_hal_clearkey_test.cpp

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

    }

drm/1.0/vts/functional/drm_hal_vendor_test.cpp

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

    }