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

Commit 2cf62382 authored by Seigo Nonaka's avatar Seigo Nonaka Committed by android-build-merger
Browse files

Merge "don't compute outside of visible range" into qt-dev am: 3a477180 am: f4dd7208 

am: 643e29bd

Change-Id: I3d497290a27a0c1f312ca5c3eb5cdf140af4e34d
parents 97a5254e 643e29bd

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