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

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

Change-Id: Ic47e7c457960a935e9831f84095013809d1ea038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Author: Treehugger Robot

libs/binder/BackendUnifiedServiceManager.cpp

@@ -215,7 +215,9 @@ Status BackendUnifiedServiceManager::getService(const ::std::string& name,
                                                 sp<IBinder>* _aidl_return) {
     os::Service service;
     Status status = getService2(name, &service);
-    *_aidl_return = service.get<os::Service::Tag::serviceWithMetadata>().service;
+    if (status.isOk()) {
+        *_aidl_return = service.get<os::Service::Tag::serviceWithMetadata>().service;
+    }
     return status;
 }