commit 49f7b751d74f7a049d5aa264653cc0a35d9ca213
author Steven Moreland <smoreland@google.com> Thu Oct 21 22:52:26 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 21 22:52:26 2021 +0000
tree 539dcd350d1b8412aae690ddab5e4e2fe5d9a857
parent 86384801d8221c06e6380a199c9a54db47b5dc20
parent b87e562e3a0ec046017ead4fda7f5b29beb3c1b7

HIDL Return withDefault const am: faad16dded am: 0844dad16c am: 1e1216610b am: b87e562e3a

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/1866758

Change-Id: I82b5fad1b00124da597366858f7ba16acdfe18ee

base/include/hidl/Status.h

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 @@
         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 @@
         return mVal;
     }
 
-    sp<T> withDefault(sp<T> t) {
-        return isOk() ? mVal : t;
-    }
+    sp<T> withDefault(sp<T> t) const { return isOk() ? mVal : t; }
 };
 
 

test_main.cpp

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