From 2b61344ddd35ceb216a836157a10769cbfaac0fa Mon Sep 17 00:00:00 2001 From: Alice Wang Date: Thu, 2 Jan 2025 11:53:05 +0000 Subject: [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 --- libs/binder/BackendUnifiedServiceManager.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libs/binder/BackendUnifiedServiceManager.h') 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* _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* _aidl_return) override; + binder::Status checkService2(const ::std::string& name, os::Service* out) override; binder::Status addService(const ::std::string& name, const sp& service, bool allowIsolated, int32_t dumpPriority) override; binder::Status listServices(int32_t dumpPriority, -- cgit v1.2.3-59-g8ed1b