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

Commit e352c1f2 authored by Sterling Huber's avatar Sterling Huber Committed by Android (Google) Code Review
Browse files

Merge "RESTRICT AUTOMERGE Do not compute outside given range in TextLine" into pi-dev

parents 0e8f1fa5 f582b9bc

core/java/android/text/TextLine.java

+3 −9
Original line number Diff line number Diff line
@@ -257,9 +257,7 @@ 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 (runLimit > mLen) {

                runLimit = mLen;

            }

            if (runStart > mLen) break;

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



            int segstart = runStart;
@@ -335,9 +333,7 @@ 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 (runLimit > mLen) {

                runLimit = mLen;

            }

            if (runStart > mLen) break;

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



            int segstart = runStart;
@@ -424,9 +420,7 @@ 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 (runLimit > mLen) {

                runLimit = mLen;

            }

            if (runStart > mLen) break;

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



            int segstart = runStart;