commit 1e497e002362d58db16011054ba3772ba7675cba
author Steven Moreland <smoreland@google.com> Tue Mar 05 19:39:10 2019 -0800
committer Steven Moreland <smoreland@google.com> Wed Mar 06 09:20:49 2019 -0800
tree 71ce5e96a9a3cf0e4221d899ccbe590b348d4af2
parent 326bc4b5f9c89d2438be3599eaeee95faf253039

Explicitly assertOk on cpp stubs.

Bug: 124861676
Test: hwservicemanager doesn't error
Change-Id: I9fb74649690991faa1c643211839a777b99740ad

generateCpp.cpp

diff --git a/generateCpp.cpp b/generateCpp.cpp
index 98e3d27..affc53d 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -1509,6 +1509,7 @@
         });
 
         out << ");\n\n";
+
         out << "::android::hardware::writeToParcel(::android::hardware::Status::ok(), "
             << "_hidl_reply);\n\n";
 
@@ -1541,7 +1542,8 @@
             out << "bool _hidl_callbackCalled = false;\n\n";
         }
 
-        out << callee << "->" << method->name() << "(";
+        out << "::android::hardware::Return<void> _hidl_ret = " << callee << "->" << method->name()
+            << "(";
 
         out.join(method->args().begin(), method->args().end(), ", ", [&] (const auto &arg) {
             if (arg->type().resultNeedsDeref()) {
@@ -1620,6 +1622,8 @@
                     superInterface);
         }
 
+        out << "_hidl_ret.assertOk();\n";
+
         if (returnsValue) {
             out << "if (!_hidl_callbackCalled) {\n";
             out.indent();