summaryrefslogtreecommitdiff
path: root/libs/binder/BackendUnifiedServiceManager.h
diff options
context:
space:
mode:
author Alice Wang <aliceywang@google.com> 2025-01-02 11:53:05 +0000
committer Alice Wang <aliceywang@google.com> 2025-01-08 08:58:39 +0000
commit2b61344ddd35ceb216a836157a10769cbfaac0fa (patch)
tree5511a7b748d718e125d1b65c1ed45b2440ac7499 /libs/binder/BackendUnifiedServiceManager.h
parent1656f6ba8334eeba3823f0669eccd07a464d1654 (diff)
[native] Restore ServiceManager#checkService() to return IBinder
This fixes crashes in 3p libraries. A new API ServiceManager#checkService2() has been introduced to work with the Service enum type. Bug: 387175643 Test: atest servicemanager_test Change-Id: I647f4a11469717c54111afab562a0be2d5260044
Diffstat (limited to 'libs/binder/BackendUnifiedServiceManager.h')
-rw-r--r--libs/binder/BackendUnifiedServiceManager.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/binder/BackendUnifiedServiceManager.h b/libs/binder/BackendUnifiedServiceManager.h
index 2496f62503..c14f28063f 100644
--- a/libs/binder/BackendUnifiedServiceManager.h
+++ b/libs/binder/BackendUnifiedServiceManager.h
@@ -122,7 +122,8 @@ public:
binder::Status getService(const ::std::string& name, sp<IBinder>* _aidl_return) override;
binder::Status getService2(const ::std::string& name, os::Service* out) override;
- binder::Status checkService(const ::std::string& name, os::Service* out) override;
+ binder::Status checkService(const ::std::string& name, sp<IBinder>* _aidl_return) override;
+ binder::Status checkService2(const ::std::string& name, os::Service* out) override;
binder::Status addService(const ::std::string& name, const sp<IBinder>& service,
bool allowIsolated, int32_t dumpPriority) override;
binder::Status listServices(int32_t dumpPriority,