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

RESTRICT AUTOMERGE Revive runLimit check logic

Browse Source 
am: b730f1984f

Change-Id: I329515d36c12ee5e12a63262ff7db8daff350832
This commit is contained in:
Seigo Nonaka
2019-10-16 17:14:15 -07:00
committed by android-build-merger
parent b51c7bb175 b730f1984f
commit 2af4f537ff
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -239,6 +239,9 @@ 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) {
runLimit = mLen;
}
if (runStart > mLen) break; if (runStart > mLen) break;
boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0; boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0;
@@ -314,6 +317,9 @@ 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) {
runLimit = mLen;
}
if (runStart > mLen) break; if (runStart > mLen) break;
boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0; boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0;
@@ -401,6 +407,9 @@ 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) {
runLimit = mLen;
}
if (runStart > mLen) break; if (runStart > mLen) break;
boolean runIsRtl = (runs[i + 1] & Layout.RUN_RTL_FLAG) != 0; boolean runIsRtl = (runs[i + 1] & Layout.RUN_RTL_FLAG) != 0;