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

StringType.h

diff --git a/StringType.h b/StringType.h
index 9062d90..f66ea09 100644
--- a/StringType.h
+++ b/StringType.h
@@ -27,11 +27,14 @@
 
     void addNamedTypesToSet(std::set<const FQName> &set) const override;
 
-    std::string getCppType(StorageMode mode,
-                           std::string *extra,
-                           bool specifyNamespaces) const override;
+    std::string getCppType(
+            StorageMode mode,
+            std::string *extra,
+            bool specifyNamespaces) const override;
 
-    std::string getJavaType() const override;
+    std::string getJavaType(
+            std::string *extra, bool /* forInitializer */) const override;
+
     std::string getJavaSuffix() const override;
 
     void emitReaderWriter(
@@ -59,6 +62,7 @@
 
     void emitJavaFieldReaderWriter(
             Formatter &out,
+            size_t depth,
             const std::string &blobName,
             const std::string &fieldName,
             const std::string &offset,