Merge "libbinder: checkVintfService" am: 0b5ac42 am: 1f678c2

am: 7b5d159

Change-Id: I0d77c6298dc6bf8b18f756ca460aef492349dce6

Author: Steven Moreland

libs/binder/include/binder/IServiceManager.h

@@ -113,13 +113,27 @@ sp<INTERFACE> waitForDeclaredService(const String16& name) {
     return interface_cast<INTERFACE>(sm->waitForService(name));
 }
 
+template <typename INTERFACE>
+sp<INTERFACE> checkDeclaredService(const String16& name) {
+    const sp<IServiceManager> sm = defaultServiceManager();
+    if (!sm->isDeclared(name)) return nullptr;
+    return interface_cast<INTERFACE>(sm->checkService(name));
+}
+
 template<typename INTERFACE>
 sp<INTERFACE> waitForVintfService(
         const String16& instance = String16("default")) {
     return waitForDeclaredService<INTERFACE>(
         INTERFACE::descriptor + String16("/") + instance);
 }
 
+template<typename INTERFACE>
+sp<INTERFACE> checkVintfService(
+        const String16& instance = String16("default")) {
+    return checkDeclaredService<INTERFACE>(
+        INTERFACE::descriptor + String16("/") + instance);
+}
+
 template<typename INTERFACE>
 status_t getService(const String16& name, sp<INTERFACE>* outService)
 {