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

[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605 am: c3ab9f6ac7 am: 2f9dd0cc12

Browse Source 
Change-Id: I287035dba62fde67b298ef638e2316b36837ee6b
This commit is contained in:
Android Build Merger (Role)
2019-07-10 18:02:55 +00:00
parent df484ced0b 2f9dd0cc12
commit ca15b13eb3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1070,6 +1070,9 @@ public abstract class Layout {
if (limit > lineEnd) {
limit = lineEnd;
}
if (limit == start) {
continue;
}
level[limit - lineStart - 1] =
(byte) ((runs[i + 1] >>> RUN_LEVEL_SHIFT) & RUN_LEVEL_MASK);
}
@@ -1165,8 +1168,8 @@ public abstract class Layout {
}
/**
* Computes in linear time the results of calling
* #getHorizontal for all offsets on a line.
* Computes in linear time the results of calling #getHorizontal for all offsets on a line.
*
* @param line The line giving the offsets we compute information for
* @param clamped Whether to clamp the results to the width of the layout
* @param primary Whether the results should be the primary or the secondary horizontal
@@ -1201,7 +1204,7 @@ public abstract class Layout {
TextLine.recycle(tl);
if (clamped) {
for (int offset = 0; offset <= wid.length; ++offset) {
for (int offset = 0; offset < wid.length; ++offset) {
if (wid[offset] > mWidth) {
wid[offset] = mWidth;
}