commit c427ba95491b213aebfc37ae17d43db90bdb6364
author Steven Moreland <smoreland@google.com> Fri Nov 01 14:54:06 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Nov 01 14:54:06 2019 -0700
tree 57dd0ed69fc567c8967ea7b1d07deebe6761ccd8
parent 0355ecabae2c5e26eedc94150df66ae8a80dd64f
parent fec67a6c6470c1872200fd804d9e1ca91ad00d6f

Merge "libbinder: waitForVintfService" am: e13f284c64 am: d42b0eb73f
am: fec67a6c64

Change-Id: I82494569a41b2b61b1ee8bc8b42e569a453f0ba5

libs/binder/include/binder/IServiceManager.h

diff --git a/libs/binder/include/binder/IServiceManager.h b/libs/binder/include/binder/IServiceManager.h
index 4a44c5a..bd77567 100644
--- a/libs/binder/include/binder/IServiceManager.h
+++ b/libs/binder/include/binder/IServiceManager.h
@@ -114,6 +114,13 @@
 }
 
 template<typename INTERFACE>
+sp<INTERFACE> waitForVintfService(
+        const String16& instance = String16("default")) {
+    return waitForDeclaredService<INTERFACE>(
+        INTERFACE::descriptor + String16("/") + instance);
+}
+
+template<typename INTERFACE>
 status_t getService(const String16& name, sp<INTERFACE>* outService)
 {
     const sp<IServiceManager> sm = defaultServiceManager();