diff options
| author | Seigo Nonaka <nona@google.com> | 2019-09-18 13:30:17 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-18 13:30:17 -0700 |
| commit | dbf4d68906b644a6f2124b72f8ee19ca7d89f768 (patch) | |
| tree | 47777d4be1719ca2215574c56615e461947f04f5 /core/java | |
| parent | d65f8c6704049a64ac14ccf282f8616430f9ad49 (diff) | |
| parent | a2778ebe0d5b0198f76a5b3034a5a61a219c4a53 (diff) | |
Merge "Do not compute outside given range in TextLine" into qt-dev am: 01082fe6ae
am: a2778ebe0d
Change-Id: I07c9f4c9a8bd9b6cdfa0f4da215d1b6f63ca9961
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/text/TextLine.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/text/TextLine.java b/core/java/android/text/TextLine.java index 86651060a394..1c50d73c4953 100644 --- a/core/java/android/text/TextLine.java +++ b/core/java/android/text/TextLine.java @@ -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); |