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

Commit c57d7d4d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[getService] Only set binder when getService2() succeeds" into main am:... 

Merge "[getService] Only set binder when getService2() succeeds" into main am: 33a6e89a am: e2bce803

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3441659



Change-Id: Ic47e7c457960a935e9831f84095013809d1ea038
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 19770b60 e2bce803

libs/binder/BackendUnifiedServiceManager.cpp

+3 −1
Original line number Diff line number Diff line
@@ -215,7 +215,9 @@ Status BackendUnifiedServiceManager::getService(const ::std::string& name, 
                                                sp<IBinder>* _aidl_return) {

    os::Service service;

    Status status = getService2(name, &service);

    if (status.isOk()) {

        *_aidl_return = service.get<os::Service::Tag::serviceWithMetadata>().service;

    }

    return status;

}