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

[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am: 77b7393e7d

Browse Source 
Change-Id: I2a5373fa2ea348adde8e5592a5a9fa489c7fe12b
This commit is contained in:
Android Build Merger (Role)
2019-07-10 18:02:32 +00:00
parent 3aaf2811fc 77b7393e7d
commit 126189263d
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

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