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

Unverified Commit 5d0daad9 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Revert "RESTRICT AUTOMERGE Do not compute outside given range in TextLine" 

This backport is incorrect and results in application crashes

This reverts commit 38f822b3.
parent c84634b9

core/java/android/text/TextLine.java

+9 −3
Original line number Diff line number Diff line
@@ -257,7 +257,9 @@ public class TextLine { 
        for (int i = 0; i < runs.length; i += 2) {

            int runStart = runs[i];

            int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK);

            if (runStart > mLen) break;

            if (runLimit > mLen) {

                runLimit = mLen;

            }

            boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0;



            int segstart = runStart;
@@ -333,7 +335,9 @@ public class TextLine { 
        for (int i = 0; i < runs.length; i += 2) {

            int runStart = runs[i];

            int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK);

            if (runStart > mLen) break;

            if (runLimit > mLen) {

                runLimit = mLen;

            }

            boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0;



            int segstart = runStart;
@@ -420,7 +424,9 @@ public class TextLine { 
        for (int i = 0; i < runs.length; i += 2) {

            int runStart = runs[i];

            int runLimit = runStart + (runs[i + 1] & Layout.RUN_LENGTH_MASK);

            if (runStart > mLen) break;

            if (runLimit > mLen) {

                runLimit = mLen;

            }

            boolean runIsRtl = (runs[i + 1] & Layout.RUN_RTL_FLAG) != 0;



            int segstart = runStart;