diff options
| author | Seigo Nonaka <nona@google.com> | 2019-09-18 13:45:49 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-18 13:45:49 -0700 |
| commit | 5bdfa1b3389e685124dd33d0f088a67fc3fb570c (patch) | |
| tree | d9355413d667697dd12d9484f5af4fb12e2f18e7 /core/java | |
| parent | 362e959c7d3643d1c550d044ed689856addb79eb (diff) | |
| parent | dbf4d68906b644a6f2124b72f8ee19ca7d89f768 (diff) | |
Merge "Do not compute outside given range in TextLine" into qt-dev am: 01082fe6ae am: a2778ebe0d
am: dbf4d68906
Change-Id: I0836bc1c5ffb5c8c45e8889411b7e6590f99964b
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); |