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

Merge "Do not compute outside given range in TextLine" into qt-dev am: 01082fe6ae

Browse Source 
am: a2778ebe0d

Change-Id: Ib75424baa8719092f659d38d95b08b4624a3da80
This commit is contained in:
Seigo Nonaka
2019-09-18 13:30:20 -07:00
committed by android-build-merger
parent 777b2325be a2778ebe0d
commit 57c3c50762
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -276,6 +276,7 @@ public class TextLine {
final int runCount = mDirections.getRunCount(); final int runCount = mDirections.getRunCount();
for (int runIndex = 0; runIndex < runCount; runIndex++) { for (int runIndex = 0; runIndex < runCount; runIndex++) {
final int runStart = mDirections.getRunStart(runIndex); final int runStart = mDirections.getRunStart(runIndex);
if (runStart > mLen) break;
final int runLimit = Math.min(runStart + mDirections.getRunLength(runIndex), mLen); final int runLimit = Math.min(runStart + mDirections.getRunLength(runIndex), mLen);
final boolean runIsRtl = mDirections.isRunRtl(runIndex); final boolean runIsRtl = mDirections.isRunRtl(runIndex);
@@ -360,6 +361,7 @@ public class TextLine {
float h = 0; float h = 0;
for (int runIndex = 0; runIndex < mDirections.getRunCount(); runIndex++) { for (int runIndex = 0; runIndex < mDirections.getRunCount(); runIndex++) {
final int runStart = mDirections.getRunStart(runIndex); final int runStart = mDirections.getRunStart(runIndex);
if (runStart > mLen) break;
final int runLimit = Math.min(runStart + mDirections.getRunLength(runIndex), mLen); final int runLimit = Math.min(runStart + mDirections.getRunLength(runIndex), mLen);
final boolean runIsRtl = mDirections.isRunRtl(runIndex); final boolean runIsRtl = mDirections.isRunRtl(runIndex);
@@ -417,6 +419,7 @@ public class TextLine {
float h = 0; float h = 0;
for (int runIndex = 0; runIndex < mDirections.getRunCount(); runIndex++) { for (int runIndex = 0; runIndex < mDirections.getRunCount(); runIndex++) {
final int runStart = mDirections.getRunStart(runIndex); final int runStart = mDirections.getRunStart(runIndex);
if (runStart > mLen) break;
final int runLimit = Math.min(runStart + mDirections.getRunLength(runIndex), mLen); final int runLimit = Math.min(runStart + mDirections.getRunLength(runIndex), mLen);
final boolean runIsRtl = mDirections.isRunRtl(runIndex); final boolean runIsRtl = mDirections.isRunRtl(runIndex);