commit fec67a6c6470c1872200fd804d9e1ca91ad00d6f
author Steven Moreland <smoreland@google.com> Fri Nov 01 14:47:04 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Nov 01 14:47:04 2019 -0700
tree 58debdd364935d2bbcea48e345f42e160a246f9f
parent a69c1bb8de8ed42affd3afbe8e2e678a73f538e0
parent d42b0eb73ff6ed31d76c3851358ab81148bb9361

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

Change-Id: Ied89364df05a82d254e4d7c47b15f6db81584a55

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();