commit a4c565f5fd0e3300fef360f5e94d275927eb17d1
author Steven Moreland <smoreland@google.com> Tue May 02 12:10:13 2017 -0700
committer Steven Moreland <smoreland@google.com> Tue May 02 21:28:39 2017 +0000
tree 64f2b96cc060882a3d710bc1516168cd7f28fc94
parent 8bed4943c3d2ff10543a1c728fc83d529f9f1eac

Passthrough oneway: keep hold on mImpl

Test: hidl_test
Bug: 37675100
Change-Id: I86815cc95091c6f439dffff975dfe81d330d9340

generateCpp.cpp

diff --git a/generateCpp.cpp b/generateCpp.cpp
index ecf058b..b675ac0 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -691,7 +691,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_" : "")
@@ -699,7 +702,6 @@
         }
         out << "] {\n";
         out.indent();
-        out << "this->";
     }
 
     out << "mImpl->"