commit 4917296debaeb74f48ddac5ce4d8f5e65020ee69
author Steven Moreland <smoreland@google.com> Fri Apr 28 16:08:43 2017 -0700
committer Steven Moreland <smoreland@google.com> Fri Apr 28 17:35:21 2017 -0700
tree 17ef07de01baeaa546ee5de9d17efa87c3ca51ca
parent 08607dcb2119d45381579682f1531e487c9414ad

libhidl: add withDefault

Shorthand way to provide default values for HIDL calls.

Fixes: 37088970
Test: libhidl_test
Change-Id: If91cfb774fa76314aeec334fbc2b18ea790912c4

base/include/hidl/Status.h

diff --git a/base/include/hidl/Status.h b/base/include/hidl/Status.h
index a04cf77..9ee80ea 100644
--- a/base/include/hidl/Status.h
+++ b/base/include/hidl/Status.h
@@ -195,6 +195,9 @@
         return mVal;
     }
 
+    T withDefault(T t) {
+        return isOk() ? mVal : t;
+    }
 };
 
 template<typename T> class Return<sp<T>> : public details::return_status {
@@ -220,6 +223,10 @@
         assertOk();
         return mVal;
     }
+
+    sp<T> withDefault(sp<T> t) {
+        return isOk() ? mVal : t;
+    }
 };