HIDL Return withDefault constandroid-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1

Bug: N/A
Test: N/A
Change-Id: I34a1a7ea54efd7aaaa722ed0b1b0840664c4e166

2 files changed, 3 insertions, 7 deletions

diff --git a/base/include/hidl/Status.h b/base/include/hidl/Status.h
index 74901bb..a204af5 100644
--- a/base/include/hidl/Status.h
+++ b/base/include/hidl/Status.h
@@ -235,9 +235,7 @@ public:
         return mVal;
     }
 
-    T withDefault(T t) {
-        return isOk() ? mVal : t;
-    }
+    T withDefault(T t) const { return isOk() ? mVal : t; }
 };
 
 template<typename T> class Return<sp<T>> : public details::return_status {
@@ -264,9 +262,7 @@ public:
         return mVal;
     }
 
-    sp<T> withDefault(sp<T> t) {
-        return isOk() ? mVal : t;
-    }
+    sp<T> withDefault(sp<T> t) const { return isOk() ? mVal : t; }
 };
 
 
diff --git a/test_main.cpp b/test_main.cpp
index 5c6c78e..8681375 100644
--- a/test_main.cpp
+++ b/test_main.cpp
@@ -550,7 +550,7 @@ TEST_F(LibHidlTest, ReturnTest) {
 
     hidl_string one = "1";
     hidl_string two = "2";
-    Return<hidl_string> ret = Return<hidl_string>(Status::fromStatusT(DEAD_OBJECT));
+    const Return<hidl_string> ret = Return<hidl_string>(Status::fromStatusT(DEAD_OBJECT));
 
     EXPECT_EQ(one, Return<hidl_string>(one).withDefault(two));
     EXPECT_EQ(two, ret.withDefault(two));