commit 4c865b72b320a46f326a335cfd326b66b0e10f67
author Andreas Huber <andih@google.com> Wed Sep 14 15:26:27 2016 -0700
committer Andreas Huber <andih@google.com> Thu Sep 15 09:28:59 2016 -0700
tree 6707fb83825317c16e65c75b31c64f8189dadbc5
parent a3558b3b273695b31fbe1025339956966cde39c4

[Java hidl-gen] Fix multi-dimensional arrays (used within structures, not

as method arguments).

Bug: 31438033
Change-Id: I8e29ae8eca2a9ef8a320e37ca0bb79dcfa8a9b9a

Type.cpp

diff --git a/Type.cpp b/Type.cpp
index 8abffd6..b09f8d3 100644
--- a/Type.cpp
+++ b/Type.cpp
@@ -73,8 +73,16 @@
     return std::string();
 }
 
+std::string Type::getJavaType(
+        std::string *extra, bool /* forInitializer */) const {
+    CHECK(!"Should not be here");
+    extra->clear();
+    return std::string();
+}
+
 std::string Type::getJavaWrapperType() const {
-    return getJavaType();
+    std::string extra;
+    return getJavaType(&extra);
 }
 
 std::string Type::getJavaSuffix() const {
@@ -123,7 +131,8 @@
 void Type::emitJavaFieldInitializer(
         Formatter &out,
         const std::string &fieldName) const {
-    out << getJavaType()
+    std::string extra;
+    out << getJavaType(&extra)
         << " "
         << fieldName
         << ";\n";
@@ -131,6 +140,7 @@
 
 void Type::emitJavaFieldReaderWriter(
         Formatter &,
+        size_t,
         const std::string &,
         const std::string &,
         const std::string &,