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

Commit c341e4c8 authored by Seigo Nonaka's avatar Seigo Nonaka Committed by android-build-team Robot
Browse files

Do not compute outside given range in TextLine 

This is second attempt of I646851973b3816bf9ba32dfe26748c0345a5a081
which breaks various layout test on application.
The empty string must be also handled by the TextLine since it
retrieves the default line height from the empty string.

Bug: 140632678
Test: StaticLayoutTest
Test: Manually done
Change-Id: I7089ed9b711dddd7de2b27c9c2fa0fb4cb53a735
(cherry picked from commit 7c38cafc)
parent eb307fdd

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);