Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "RESTRICT AUTOMERGE Do not compute outside given range in TextLine" into pi-dev

Browse Source
This commit is contained in:
Sterling Huber
2019-10-02 15:51:19 +00:00
committed by Android (Google) Code Review
parent 0e8f1fa5e9 f582b9bc98
commit e352c1f2bc
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/text/TextLine.java
View File

@@ -257,9 +257,7 @@ public class TextLine {
for (int i = 0; i < runs.length; i += 2) { for (int i = 0; i < runs.length; i += 2) {
int runStart = runs[i]; int runStart = runs[i];
int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK); int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK);
if (runLimit > mLen) { if (runStart > mLen) break;
runLimit = mLen;
}
boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0; boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0;
int segstart = runStart; int segstart = runStart;
@@ -335,9 +333,7 @@ public class TextLine {
for (int i = 0; i < runs.length; i += 2) { for (int i = 0; i < runs.length; i += 2) {
int runStart = runs[i]; int runStart = runs[i];
int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK); int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK);
if (runLimit > mLen) { if (runStart > mLen) break;
runLimit = mLen;
}
boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0; boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0;
int segstart = runStart; int segstart = runStart;
@@ -424,9 +420,7 @@ public class TextLine {
for (int i = 0; i < runs.length; i += 2) { for (int i = 0; i < runs.length; i += 2) {
int runStart = runs[i]; int runStart = runs[i];
int runLimit = runStart + (runs[i + 1] & Layout.RUN_LENGTH_MASK); int runLimit = runStart + (runs[i + 1] & Layout.RUN_LENGTH_MASK);
if (runLimit > mLen) { if (runStart > mLen) break;
runLimit = mLen;
}
boolean runIsRtl = (runs[i + 1] & Layout.RUN_RTL_FLAG) != 0; boolean runIsRtl = (runs[i + 1] & Layout.RUN_RTL_FLAG) != 0;
int segstart = runStart; int segstart = runStart;