diff options
| author | 2019-10-02 15:51:19 +0000 | |
|---|---|---|
| committer | 2019-10-02 15:51:19 +0000 | |
| commit | e352c1f2bc0cb440d39180ce4a273e9128c76dcd (patch) | |
| tree | 0605a2b008a6272670eed42b1407d17a8a1631e0 | |
| parent | 0e8f1fa5e915a62dc51974ff6445572d830235cd (diff) | |
| parent | f582b9bc9834c80f48070b032637dd1c94ebe6f4 (diff) | |
Merge "RESTRICT AUTOMERGE Do not compute outside given range in TextLine" into pi-dev
| -rw-r--r-- | core/java/android/text/TextLine.java | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/core/java/android/text/TextLine.java b/core/java/android/text/TextLine.java index 5bfd3e942934..ddeaece4cb8a 100644 --- a/core/java/android/text/TextLine.java +++ b/core/java/android/text/TextLine.java @@ -257,9 +257,7 @@ public class TextLine { for (int i = 0; i < runs.length; i += 2) { int runStart = runs[i]; int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK); - if (runLimit > mLen) { - runLimit = mLen; - } + if (runStart > mLen) break; boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0; int segstart = runStart; @@ -335,9 +333,7 @@ public class TextLine { for (int i = 0; i < runs.length; i += 2) { int runStart = runs[i]; int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK); - if (runLimit > mLen) { - runLimit = mLen; - } + if (runStart > mLen) break; boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0; int segstart = runStart; @@ -424,9 +420,7 @@ public class TextLine { for (int i = 0; i < runs.length; i += 2) { int runStart = runs[i]; int runLimit = runStart + (runs[i + 1] & Layout.RUN_LENGTH_MASK); - if (runLimit > mLen) { - runLimit = mLen; - } + if (runStart > mLen) break; boolean runIsRtl = (runs[i + 1] & Layout.RUN_RTL_FLAG) != 0; int segstart = runStart; |