Merge "Fix java-client generation of HIDL code"
am: f07e51ddae
Change-Id: I4f5d07866d6c3936ff5e5c907e1f9478dc67f2d2
diff --git a/StringType.cpp b/StringType.cpp
index d729efb..223d819 100644
--- a/StringType.cpp
+++ b/StringType.cpp
@@ -209,7 +209,7 @@
void StringType::getAlignmentAndSize(size_t *align, size_t *size) const {
*align = 8; // hidl_string
- *size = 24;
+ *size = 16;
}
} // namespace android
diff --git a/VectorType.cpp b/VectorType.cpp
index 26eac76..ba4ec6b 100644
--- a/VectorType.cpp
+++ b/VectorType.cpp
@@ -559,9 +559,9 @@
out.unindent();
out << fieldName << ".clear();\n";
- out << "long _hidl_vec_size = "
+ out << "int _hidl_vec_size = "
<< blobName
- << ".getInt64("
+ << ".getInt32("
<< offset
<< " + 8 /* offsetof(hidl_vec<T>, mSize) */);\n";
@@ -608,19 +608,19 @@
out << "{\n";
out.indent();
- out << "long _hidl_vec_size = "
+ out << "int _hidl_vec_size = "
<< fieldName
<< ".size();\n";
out << blobName
- << ".putInt64("
+ << ".putInt32("
<< offset
<< " + 8 /* offsetof(hidl_vec<T>, mSize) */, _hidl_vec_size);\n";
out << blobName
<< ".putBool("
<< offset
- << " + 16 /* offsetof(hidl_vec<T>, mOwnsBuffer) */, false);\n";
+ << " + 12 /* offsetof(hidl_vec<T>, mOwnsBuffer) */, false);\n";
size_t elementAlign, elementSize;
elementType->getAlignmentAndSize(&elementAlign, &elementSize);
@@ -724,7 +724,7 @@
void VectorType::getAlignmentAndSize(size_t *align, size_t *size) const {
*align = 8; // hidl_vec<T>
- *size = 24;
+ *size = 16;
}
} // namespace android