From 7ab1900a5a4d7675f19b3aeca51ee8bf3c075db5 Mon Sep 17 00:00:00 2001
From: Alan Lau <alanlau@google.com>
Date: Wed, 30 Jul 2014 17:35:29 +0000
Subject: [PATCH] Revert "Revert "DO NOT MERGE Fix extraneous allocation and
 copying""

This reverts commit af60e56b39582ea90ccd7601cd06350a50bf6500.

Change-Id: I1aa698608773b9e540457831e11218f371c71268
---
 core/jni/android_text_StaticLayout.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/jni/android_text_StaticLayout.cpp b/core/jni/android_text_StaticLayout.cpp
index 696926ca5543e..9e20d18c4c40e 100644
--- a/core/jni/android_text_StaticLayout.cpp
+++ b/core/jni/android_text_StaticLayout.cpp
@@ -63,7 +63,7 @@ static jintArray nLineBreakOpportunities(JNIEnv* env, jclass, jstring javaLocale
                                         jcharArray inputText, jint length,
                                         jintArray recycle) {
     jintArray ret;
-    std::vector<jint> breaks(16);
+    std::vector<jint> breaks;
 
     ScopedIcuLocale icuLocale(env, javaLocaleName);
     if (icuLocale.valid()) {
@@ -84,7 +84,7 @@ static jintArray nLineBreakOpportunities(JNIEnv* env, jclass, jstring javaLocale
 
     breaks.push_back(-1); // sentinel terminal value
 
-    if (recycle != NULL && env->GetArrayLength(recycle) >= breaks.size()) {
+    if (recycle != NULL && static_cast<size_t>(env->GetArrayLength(recycle)) >= breaks.size()) {
         ret = recycle;
     } else {
         ret = env->NewIntArray(breaks.size());