diff options
| author | Seigo Nonaka <nona@google.com> | 2019-09-11 15:12:40 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-11 15:12:40 -0700 |
| commit | 6b4b45d1fa3823411baa88995bfe61c04229ca10 (patch) | |
| tree | 20a31e1e657233e3fe2ebf06acbf1d93edbeae00 /core/java | |
| parent | 9b2f502e0a6e71e01a0558c02f0972c3af87b5a1 (diff) | |
| parent | f4dd720828aad28b3e51985998c318c31ab4b4a8 (diff) | |
Merge "don't compute outside of visible range" into qt-dev am: 3a477180f4
am: f4dd720828
Change-Id: Icea198f4b16c3031aae16f20436804ce9c15e7e0
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..5a2d8f4329dc 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); |