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

Commit 69f9aa86 authored by Peter Kalauskas's avatar Peter Kalauskas Committed by android-build-merger
Browse files

Convert LazyServiceRegistrar usage to singleton am: caed24ba 

am: 05d36f94

Change-Id: Id665b84417e0e66b0c89567b5489ad66b884eaaf
parents 81dcae16 05d36f94

camera/provider/2.5/default/service.cpp

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ int main() 


    status_t status;

    if (kLazyService) {

        auto serviceRegistrar = std::make_shared<::android::hardware::LazyServiceRegistrar>();

        status = serviceRegistrar->registerService(provider, "legacy/0");

        auto serviceRegistrar = ::android::hardware::LazyServiceRegistrar::getInstance();

        status = serviceRegistrar.registerService(provider, "legacy/0");

    } else {

        status = provider->registerAsService("legacy/0");

    }

cas/1.1/default/service.cpp

+2 −2
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ int main() { 
    android::sp<IMediaCasService> service = new MediaCasService();

    android::status_t status;

    if (kLazyService) {

        auto serviceRegistrar = std::make_shared<LazyServiceRegistrar>();

        status = serviceRegistrar->registerService(service);

        auto serviceRegistrar = LazyServiceRegistrar::getInstance();

        status = serviceRegistrar.registerService(service);

    } else {

        status = service->registerAsService();

    }

wifi/1.3/default/service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ int main(int /*argc*/, char** argv) { 
            std::make_shared<WifiIfaceUtil>(iface_tool),

            std::make_shared<WifiFeatureFlags>());

    if (kLazyService) {

        LazyServiceRegistrar registrar;

        auto registrar = LazyServiceRegistrar::getInstance();

        CHECK_EQ(registrar.registerService(service), android::NO_ERROR)

            << "Failed to register wifi HAL";

    } else {