commit 33a6e89aa8ebde305ea3bc408d3b5b96756cacd6
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jan 09 09:01:52 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 09 09:01:52 2025 -0800
tree 4f022d279b7e064bcfe5ebd1adcd1c68bdbba382
parent a11599667a5420cb53866e2e75bbdc19c666609a
parent 0aa07a1179c27192a99daf76579652413f840018

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

libs/binder/BackendUnifiedServiceManager.cpp

diff --git a/libs/binder/BackendUnifiedServiceManager.cpp b/libs/binder/BackendUnifiedServiceManager.cpp
index 4220cdd..7c0319a 100644
--- a/libs/binder/BackendUnifiedServiceManager.cpp
+++ b/libs/binder/BackendUnifiedServiceManager.cpp
@@ -215,7 +215,9 @@
                                                 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;
 }