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

Commit 07e975d9 authored by Charles Chen's avatar Charles Chen Committed by Android (Google) Code Review
Browse files

Merge "Replace addServiceWithIsolated ndk API" into udc-dev

parents 85a03cea d2fb31f6

services/mediaresourcemanager/ResourceManagerService.cpp

+3 −2
Original line number Diff line number Diff line
@@ -344,8 +344,9 @@ void ResourceManagerService::instantiate() { 
    std::shared_ptr<ResourceManagerService> service =

            ::ndk::SharedRefBase::make<ResourceManagerService>();

    binder_status_t status =

                        AServiceManager_addServiceWithAllowIsolated(

                        service->asBinder().get(), getServiceName(), /*allowIsolated=*/ true);

                        AServiceManager_addServiceWithFlag(

                        service->asBinder().get(), getServiceName(),

                        AServiceManager_AddServiceFlag::ADD_SERVICE_ALLOW_ISOLATED);

    if (status != STATUS_OK) {

        return;

    }

services/mediaresourcemanager/ResourceObserverService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -100,9 +100,9 @@ void ResourceObserverService::BinderDiedCallback(void* cookie) { 
std::shared_ptr<ResourceObserverService> ResourceObserverService::instantiate() {

    std::shared_ptr<ResourceObserverService> observerService =

            ::ndk::SharedRefBase::make<ResourceObserverService>();

    binder_status_t status = AServiceManager_addServiceWithAllowIsolated(

    binder_status_t status = AServiceManager_addServiceWithFlag(

      observerService->asBinder().get(),ResourceObserverService::getServiceName(),

      /*allowIsolated=*/ true);

      AServiceManager_AddServiceFlag::ADD_SERVICE_ALLOW_ISOLATED);



    if (status != STATUS_OK) {

        return nullptr;