Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 839ca0d5 authored by Alan Lau's avatar Alan Lau Committed by Android Git Automerger
Browse files

am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and... 

am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev

* commit '06a84554':
  Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""
parents 60e7f541 06a84554

core/jni/android_text_StaticLayout.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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());