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

Commit b8082603 authored by Raph Levien's avatar Raph Levien
Browse files

Remove duplicate line breaking 

Fix for bug 17297223 "minikin crashing after boot on hammerhead in
master"

Due to improperly merged code, the line breaker was being run twice,
causing two copies of the layout. That in turn caused text crashes
because the line ends are not monotonic.

Change-Id: Ieaa702c530d6e9b2a90fb52a4ad716a9ddb567e7
parent 36ada7c7

core/jni/android_text_StaticLayout.cpp

+0 −2
Original line number Diff line number Diff line
@@ -568,8 +568,6 @@ static jint nComputeLineBreaks(JNIEnv* env, jclass, jstring javaLocaleName, 
    std::vector<float> computedWidths;

    std::vector<unsigned char> computedFlags;



    GreedyLineBreaker breaker(primitives, lineWidth);

    breaker.computeBreaks(&computedBreaks, &computedWidths, &computedFlags);

    if (optimize) {

        OptimizingLineBreaker breaker(primitives, lineWidth);

        breaker.computeBreaks(&computedBreaks, &computedWidths, &computedFlags);