commit ef1a9feda3f09f87f0673cc978b36e1d4a8b4223
author Steven Moreland <smoreland@google.com> Thu Oct 06 17:19:09 2016 -0700
committer Steven Moreland <smoreland@google.com> Tue Oct 11 14:29:36 2016 -0700
tree ed66f6917e7a39a3f03a6f2777ba349514750756
parent b725d679b19a1a5e74e30666450832469bc35cbd

Get rid of call enum.

Bug: 31758541
Test: hidl_test, hardware/interfaces mma, manual inspection of output
files

Change-Id: I16c076dbff9b0b8688e2492b0b9c97e9f6d48943

generateJava.cpp

diff --git a/generateJava.cpp b/generateJava.cpp
index e9958b6..1e0c478 100644
--- a/generateJava.cpp
+++ b/generateJava.cpp
@@ -21,7 +21,6 @@
 #include "Method.h"
 #include "Scope.h"
 
-#include <hidl-util/StringHelper.h>
 #include <hidl-util/Formatter.h>
 #include <android-base/logging.h>
 
@@ -223,36 +222,6 @@
         return err;
     }
 
-    const std::string base = (superType != NULL)
-        ? (superType->fullJavaName() + ".kOpEnd")
-        : "IHwBinder.FIRST_CALL_TRANSACTION";
-
-    bool first = true;
-    size_t index = 0;
-    for (const auto &method : iface->methods()) {
-        out << "public static final int kOp_"
-            << StringHelper::Uppercase(method->name())
-            << " = "
-            << base;
-
-        if (!first) {
-            out << " + " << index;
-        }
-
-        out << ";\n";
-
-        ++index;
-        first = false;
-    }
-
-    out << "public static final int kOpEnd = "
-        << base
-        << " + "
-        << index
-        << ";";
-
-    out << "\n\n";
-
     for (const auto &method : iface->methods()) {
         const bool returnsValue = !method->results().empty();
         const bool needsCallback = method->results().size() > 1;
@@ -373,9 +342,11 @@
             }
 
             out << "\nHwParcel reply = new HwParcel();\n"
-                << "mRemote.transact(kOp_"
-                << StringHelper::Uppercase(method->name())
-                << ", request, reply, ";
+                << "mRemote.transact("
+                << method->getSerialId()
+                << " /* "
+                << method->name()
+                << " */, request, reply, ";
 
             if (method->isOneway()) {
                 out << "IHwBinder.FLAG_ONEWAY";
@@ -476,11 +447,10 @@
             const bool needsCallback = method->results().size() > 1;
 
             out << "case "
-                << superInterface->fullJavaName()
-                << ".kOp_"
-                <<
-                StringHelper::Uppercase(method->name())
-                << ":\n{\n";
+                << method->getSerialId()
+                << " /* "
+                << method->name()
+                << " */:\n{\n";
 
             out.indent();