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

Commit 4c4650cb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not compute outside given range in TextLine"

parents e9eb25e1 7554fa20

core/java/android/text/TextLine.java

+3 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ public class TextLine { 
        final int runCount = mDirections.getRunCount();

        for (int runIndex = 0; runIndex < runCount; runIndex++) {

            final int runStart = mDirections.getRunStart(runIndex);

            if (runStart > mLen) break;

            final int runLimit = Math.min(runStart + mDirections.getRunLength(runIndex), mLen);

            final boolean runIsRtl = mDirections.isRunRtl(runIndex);
@@ -360,6 +361,7 @@ public class TextLine { 
        float h = 0;

        for (int runIndex = 0; runIndex < mDirections.getRunCount(); runIndex++) {

            final int runStart = mDirections.getRunStart(runIndex);

            if (runStart > mLen) break;

            final int runLimit = Math.min(runStart + mDirections.getRunLength(runIndex), mLen);

            final boolean runIsRtl = mDirections.isRunRtl(runIndex);
@@ -417,6 +419,7 @@ public class TextLine { 
        float h = 0;

        for (int runIndex = 0; runIndex < mDirections.getRunCount(); runIndex++) {

            final int runStart = mDirections.getRunStart(runIndex);

            if (runStart > mLen) break;

            final int runLimit = Math.min(runStart + mDirections.getRunLength(runIndex), mLen);

            final boolean runIsRtl = mDirections.isRunRtl(runIndex);