diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-07-10 18:02:55 +0000 |
---|---|---|
committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-07-10 18:02:55 +0000 |
commit | ca15b13eb3468b879f57c2f47ff0a257f56ea212 (patch) | |
tree | e31973847d6b3b7622b8f490b49c202dbcbb7cdb | |
parent | df484ced0b91373894f875c5a88743b8abcda3fc (diff) | |
parent | 2f9dd0cc129b0c3c4237784b95e8b0cb9696e1ed (diff) | |
download | base-ca15b13eb3468b879f57c2f47ff0a257f56ea212.tar.gz |
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605 am: c3ab9f6ac7 am: 2f9dd0cc12
Change-Id: I287035dba62fde67b298ef638e2316b36837ee6b
-rw-r--r-- | core/java/android/text/Layout.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index 84ef9435f64c..8f9233f06839 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -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; } |