commit 4b39bc1f39be21134f44daa18fb6eca69695c915
author Steven Moreland <smoreland@google.com> Wed Nov 16 10:42:24 2016 -0800
committer Steven Moreland <smoreland@google.com> Wed Nov 16 11:37:37 2016 -0800
tree e8d4ae927fc0f71069446cbadb77cea604bb4a1f
parent f9dc1bd1b612af829fb6fae31dc11998c8c02351

Remove name collisions in java onTransact.

Test: hidl_test_java
Bug: 31527497
Change-Id: I3a311c3296f2f3b54f23c40017f848c7d59eca7d

generateJava.cpp

diff --git a/generateJava.cpp b/generateJava.cpp
index b4976a4..03ce7c7 100644
--- a/generateJava.cpp
+++ b/generateJava.cpp
@@ -320,25 +320,25 @@
         out << ") {\n";
         out.indent();
 
-        out << "android.os.HwParcel request = new android.os.HwParcel();\n";
-        out << "request.writeInterfaceToken("
+        out << "android.os.HwParcel _hidl_request = new android.os.HwParcel();\n";
+        out << "_hidl_request.writeInterfaceToken("
             << superInterface->fullJavaName()
             << ".kInterfaceName);\n";
 
         for (const auto &arg : method->args()) {
             emitJavaReaderWriter(
                     out,
-                    "request",
+                    "_hidl_request",
                     arg,
                     false /* isReader */);
         }
 
-        out << "\nandroid.os.HwParcel reply = new android.os.HwParcel();\n"
+        out << "\nandroid.os.HwParcel _hidl_reply = new android.os.HwParcel();\n"
             << "mRemote.transact("
             << method->getSerialId()
             << " /* "
             << method->name()
-            << " */, request, reply, ";
+            << " */, _hidl_request, _hidl_reply, ";
 
         if (method->isOneway()) {
             out << "android.os.IHwBinder.FLAG_ONEWAY";
@@ -349,12 +349,12 @@
         out << ");\n";
 
         if (!method->isOneway()) {
-            out << "reply.verifySuccess();\n";
+            out << "_hidl_reply.verifySuccess();\n";
         } else {
             CHECK(!returnsValue);
         }
 
-        out << "request.releaseTemporaryStorage();\n";
+        out << "_hidl_request.releaseTemporaryStorage();\n";
 
         if (returnsValue) {
             out << "\n";
@@ -362,7 +362,7 @@
             for (const auto &arg : method->results()) {
                 emitJavaReaderWriter(
                         out,
-                        "reply",
+                        "_hidl_reply",
                         arg,
                         true /* isReader */);
             }
@@ -442,12 +442,14 @@
     out << "}\n\n";
 
     out << "public void onTransact("
-        << "int code, android.os.HwParcel request, final android.os.HwParcel reply, "
-        << "int flags) {\n";
+        << "int _hidl_code, "
+        << "android.os.HwParcel _hidl_request, "
+        << "final android.os.HwParcel _hidl_reply, "
+        << "int _hidl_flags) {\n";
 
     out.indent();
 
-    out << "switch (code) {\n";
+    out << "switch (_hidl_code) {\n";
 
     out.indent();
 
@@ -465,14 +467,14 @@
 
         out.indent();
 
-        out << "request.enforceInterface("
+        out << "_hidl_request.enforceInterface("
             << superInterface->fullJavaName()
             << ".kInterfaceName);\n\n";
 
         for (const auto &arg : method->args()) {
             emitJavaReaderWriter(
                     out,
-                    "request",
+                    "_hidl_request",
                     arg,
                     true /* isReader */);
         }
@@ -514,17 +516,17 @@
                 << ") {\n";
 
             out.indent();
-            out << "reply.writeStatus(android.os.HwParcel.STATUS_SUCCESS);\n";
+            out << "_hidl_reply.writeStatus(android.os.HwParcel.STATUS_SUCCESS);\n";
 
             for (const auto &arg : method->results()) {
                 emitJavaReaderWriter(
                         out,
-                        "reply",
+                        "_hidl_reply",
                         arg,
                         false /* isReader */);
             }
 
-            out << "reply.send();\n"
+            out << "_hidl_reply.send();\n"
                       << "}}";
 
             out.unindent();
@@ -534,19 +536,19 @@
         out << ");\n";
 
         if (!needsCallback) {
-            out << "reply.writeStatus(android.os.HwParcel.STATUS_SUCCESS);\n";
+            out << "_hidl_reply.writeStatus(android.os.HwParcel.STATUS_SUCCESS);\n";
 
             if (returnsValue) {
                 const TypedVar *returnArg = method->results()[0];
 
                 emitJavaReaderWriter(
                         out,
-                        "reply",
+                        "_hidl_reply",
                         returnArg,
                         false /* isReader */);
             }
 
-            out << "reply.send();\n";
+            out << "_hidl_reply.send();\n";
         }
 
         out << "break;\n";