From 314a30293347a7a3d5dd032f08677d9e988721cf Mon Sep 17 00:00:00 2001
From: Ficus Kirkpatrick <ficus@android.com>
Date: Mon, 8 Apr 2013 13:47:44 -0700
Subject: Don't use Arrays.copyOf in generated code.

It didn't appear until API 9 and is thus incompatible with Froyo.
Instead, allocate a new array and System.arraycopy inline.

Change-Id: I2e1cd07a4a762ef8edd5ec06ceaa1d38b302823d
---
 .../protobuf/compiler/javanano/javanano_enum_field.cc    |  4 +++-
 .../protobuf/compiler/javanano/javanano_message_field.cc |  4 +++-
 .../compiler/javanano/javanano_primitive_field.cc        | 16 ++++++++++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'src/google')

diff --git a/src/google/protobuf/compiler/javanano/javanano_enum_field.cc b/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
index 2c6fd5de..a22aa6fd 100644
--- a/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
+++ b/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
@@ -166,7 +166,9 @@ GenerateParsingCode(io::Printer* printer) const {
     printer->Print(variables_,
       "int arrayLength = com.google.protobuf.nano.WireFormatNano.getRepeatedFieldArrayLength(input, $tag$);\n"
       "int i = this.$name$.length;\n"
-      "this.$name$ = java.util.Arrays.copyOf(this.$name$, this.$name$.length + arrayLength);\n"
+      "int[] newArray = new int[i + arrayLength];\n"
+      "System.arraycopy(this.$name$, 0, newArray, 0, i);\n"
+      "this.$name$ = newArray;\n"
       "for (; i < this.$name$.length - 1; i++) {\n"
       "  this.$name$[i] = input.readInt32();\n"
       "  input.readTag();\n"
diff --git a/src/google/protobuf/compiler/javanano/javanano_message_field.cc b/src/google/protobuf/compiler/javanano/javanano_message_field.cc
index 01529c81..ec9d995f 100644
--- a/src/google/protobuf/compiler/javanano/javanano_message_field.cc
+++ b/src/google/protobuf/compiler/javanano/javanano_message_field.cc
@@ -144,7 +144,9 @@ GenerateParsingCode(io::Printer* printer) const {
   printer->Print(variables_,
     "int arrayLength = com.google.protobuf.nano.WireFormatNano.getRepeatedFieldArrayLength(input, $tag$);\n"
     "int i = this.$name$.length;\n"
-    "this.$name$ = java.util.Arrays.copyOf(this.$name$, i + arrayLength);\n"
+    "$type$[] newArray = new $type$[i + arrayLength];\n"
+    "System.arraycopy(this.$name$, 0, newArray, 0, i);\n"
+    "this.$name$ = newArray;\n"
     "for (; i < this.$name$.length - 1; i++) {\n"
     "  this.$name$[i] = new $type$();\n");
 
diff --git a/src/google/protobuf/compiler/javanano/javanano_primitive_field.cc b/src/google/protobuf/compiler/javanano/javanano_primitive_field.cc
index f5b25b68..1cf90662 100644
--- a/src/google/protobuf/compiler/javanano/javanano_primitive_field.cc
+++ b/src/google/protobuf/compiler/javanano/javanano_primitive_field.cc
@@ -391,8 +391,20 @@ GenerateParsingCode(io::Printer* printer) const {
   } else {
     printer->Print(variables_,
       "int arrayLength = com.google.protobuf.nano.WireFormatNano.getRepeatedFieldArrayLength(input, $tag$);\n"
-      "int i = this.$name$.length;\n"
-      "this.$name$ = java.util.Arrays.copyOf(this.$name$, this.$name$.length + arrayLength);\n"
+      "int i = this.$name$.length;\n");
+
+    if (GetJavaType(descriptor_) == JAVATYPE_BYTES) {
+      printer->Print(variables_,
+        "byte[][] newArray = new byte[i + arrayLength][];\n"
+        "System.arraycopy(this.$name$, 0, newArray, 0, i);\n"
+        "this.$name$ = newArray;\n");
+    } else {
+      printer->Print(variables_,
+        "$type$[] newArray = new $type$[i + arrayLength];\n"
+        "System.arraycopy(this.$name$, 0, newArray, 0, i);\n"
+        "this.$name$ = newArray;\n");
+    }
+    printer->Print(variables_,
       "for (; i < this.$name$.length - 1; i++) {\n"
       "  this.$name$[i] = input.read$capitalized_type$();\n"
       "  input.readTag();\n"
-- 
cgit v1.2.3