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

ScalarType.cpp

diff --git a/ScalarType.cpp b/ScalarType.cpp
index b2b869e..2bff4ab 100644
--- a/ScalarType.cpp
+++ b/ScalarType.cpp
@@ -58,7 +58,8 @@
     return kName[mKind];
 }
 
-std::string ScalarType::getJavaType() const {
+std::string ScalarType::getJavaType(
+        std::string *extra, bool /* forInitializer */) const {
     static const char *const kName[] = {
         "boolean",
         "long",
@@ -74,6 +75,7 @@
         "double"
     };
 
+    extra->clear();
     return kName[mKind];
 }
 
@@ -184,6 +186,7 @@
 
 void ScalarType::emitJavaFieldReaderWriter(
         Formatter &out,
+        size_t /* depth */,
         const std::string &blobName,
         const std::string &fieldName,
         const std::string &offset,