diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-07-10 18:02:29 +0000 |
---|---|---|
committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-07-10 18:02:29 +0000 |
commit | 77b7393e7de1b54435c74e864c0db84787fe4076 (patch) | |
tree | 3d1faba90166b6ae10f3619776c9ba24bd9e3c85 | |
parent | e6bf15385562a8d51fa9dd4c3a105696b6cf5b08 (diff) | |
parent | 2778b1e49d4263f47e4dc7e3e3e29cf1b423618c (diff) | |
download | base-77b7393e7de1b54435c74e864c0db84787fe4076.tar.gz |
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d
Change-Id: I0c15ebaddd8d8edb9ff630ffbe4d855219b06907
-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 3bc9390c5815..0999b982d990 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -919,6 +919,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); } @@ -1014,8 +1017,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 @@ -1050,7 +1053,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; } |