diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-07-10 18:02:37 +0000 |
---|---|---|
committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-07-10 18:02:37 +0000 |
commit | 29534f6c57148c024aee59d82340eadf033c747a (patch) | |
tree | e31973847d6b3b7622b8f490b49c202dbcbb7cdb | |
parent | df484ced0b91373894f875c5a88743b8abcda3fc (diff) | |
parent | 126189263d1c4cd8ee2b403cecf024fe9d331c03 (diff) | |
download | base-29534f6c57148c024aee59d82340eadf033c747a.tar.gz |
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am: 77b7393e7d am: 126189263d
Change-Id: If52ab20b7cd84d02518bdfcd46987e329b654e2d
-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; } |