commit ca279944d7630eb481c6282add0df58e715e2953
author Steven Moreland <smoreland@google.com> Tue May 02 12:10:13 2017 -0700
committer Steven Moreland <smoreland@google.com> Tue May 02 16:19:37 2017 -0700
tree 325f17a53c9d1fcf20d3ccf27ae865053225b2e0
parent 401306ebb6a0f2f72717ed253092ce208d9802da

Passthrough oneway: keep hold on mImpl

Test: hidl_test
Bug: 37675100
(cherry picked from commit a4c565f5fd0e3300fef360f5e94d275927eb17d1)
Merged-In: I86815cc95091c6f439dffff975dfe81d330d9340
Change-Id: I86815cc95091c6f439dffff975dfe81d330d9340

generateCpp.cpp

diff --git a/generateCpp.cpp b/generateCpp.cpp
index 44c785b..e12d140 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -690,7 +690,10 @@
     out << "auto _hidl_return = ";
 
     if (method->isOneway()) {
-        out << "addOnewayTask([this, &_hidl_error";
+        out << "addOnewayTask([mImpl = this->mImpl, "
+               "mEnableInstrumentation = this->mEnableInstrumentation, "
+               "mInstrumentationCallbacks = this->mInstrumentationCallbacks, "
+               "&_hidl_error";
         for (const auto &arg : method->args()) {
             out << ", "
                 << (arg->type().isInterface() ? "_hidl_wrapped_" : "")
@@ -698,7 +701,6 @@
         }
         out << "] {\n";
         out.indent();
-        out << "this->";
     }
 
     out << "mImpl->"