Merge "Java: Add checked exceptions to methods."
diff --git a/generateCpp.cpp b/generateCpp.cpp
index bdc59a1..c867bee 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -163,7 +163,7 @@
out << ");\n";
});
});
- out.sIf("ret.getStatus().isOk()", [&] {
+ out.sIf("ret.isOk()", [&] {
out << "iface = I" << baseName << "::castFrom(base);\n";
out.sIf("iface != nullptr", [&] {
out << "return iface;\n";
@@ -215,7 +215,7 @@
out << "success = addRet.isOk() && addRet;\n";
});
out << ");\n";
- out << "success = success && ret.getStatus().isOk();\n";
+ out << "success = success && ret.isOk();\n";
});
out << "return success ? ::android::OK : ::android::UNKNOWN_ERROR;\n";
}).endl().endl();
diff --git a/test/java_test/hidl_test_java_native.cpp b/test/java_test/hidl_test_java_native.cpp
index 58a92b8..6b276bf 100644
--- a/test/java_test/hidl_test_java_native.cpp
+++ b/test/java_test/hidl_test_java_native.cpp
@@ -633,7 +633,7 @@
template <typename T>
static void EXPECT_OK(::android::hardware::Return<T> ret) {
- EXPECT_TRUE(ret.getStatus().isOk());
+ EXPECT_TRUE(ret.isOk());
}
TEST_F(HidlTest, BazSomeBaseMethodTest) {
diff --git a/test/main.cpp b/test/main.cpp
index 0b98d6b..2e5d6e4 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -124,9 +124,9 @@
template <typename T>
static inline ::testing::AssertionResult isOk(::android::hardware::Return<T> ret) {
- return ret.getStatus().isOk()
- ? (::testing::AssertionSuccess() << ret.getStatus())
- : (::testing::AssertionFailure() << ret.getStatus());
+ return ret.isOk()
+ ? (::testing::AssertionSuccess() << ret.description())
+ : (::testing::AssertionFailure() << ret.description());
}
template<typename T, typename S>