drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1a408a34: DO NOT MERGE Fix extraneous allocation and copying

Browse Source 
* commit '1a408a344c7921d7c943826bea3ce0cdd822583d':
  DO NOT MERGE Fix extraneous allocation and copying
This commit is contained in:
Anish Athalye
2014-07-28 19:53:26 +00:00
committed by Android Git Automerger
parent 3150372342 1a408a344c
commit a665380b60
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android_text_StaticLayout.cpp
View File

@ -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());