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

Commit 4ddbdbca authored by Peter Kalauskas's avatar Peter Kalauskas Committed by android-build-merger
Browse files

Merge "Convert LazyServiceRegistrar usage to singleton" am: f71728f0 

am: 0c7812c7

Change-Id: I791d55bcf0a5044cf19c8cb80bfb622a548fc554
parents 53712ca9 0c7812c7

cas/1.0/default/service.cpp

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

    android::sp<IMediaCasService> service = new MediaCasService();

    android::status_t status;

    android::status_t status;

    if (kLazyService) {

    if (kLazyService) {

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

        auto serviceRegistrar = LazyServiceRegistrar::getInstance();

        status = serviceRegistrar->registerService(service);

        status = serviceRegistrar.registerService(service);

    } else {

    } else {

        status = service->registerAsService();

        status = service->registerAsService();

    }

    }

health/storage/1.0/default/service.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ int main() { 
    configureRpcThreadpool(1, true);

    configureRpcThreadpool(1, true);





    sp<IStorage> service = new Storage();

    sp<IStorage> service = new Storage();

    LazyServiceRegistrar registrar;

    auto registrar = LazyServiceRegistrar::getInstance();

    status_t result = registrar.registerService(service);

    status_t result = registrar.registerService(service);





    if (result != OK) {

    if (result != OK) {