summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2015-04-15 04:04:40 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-15 04:04:46 +0000
commite26bd2c361bf506830350ef3e2ba2029355a2216 (patch)
treee869ee1f062f8a56b7c308f84fe41741cf3d3c62 /core/java
parent3b5adaaca1653969cb12befc5f2a6dda31c90605 (diff)
parented2eea1bfc1fb57d3b34f2c1e6062b541737e73e (diff)
Merge "Fix crash when ellipsize="start" is applied to short line."
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/text/StaticLayout.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java
index 2bcb3529de92..7828851a28f3 100644
--- a/core/java/android/text/StaticLayout.java
+++ b/core/java/android/text/StaticLayout.java
@@ -811,7 +811,7 @@ public class StaticLayout extends Layout {
float sum = 0;
int i;
- for (i = len; i >= 0; i--) {
+ for (i = len; i > 0; i--) {
float w = widths[i - 1 + lineStart - widthStart];
if (w + sum + ellipsisWidth > avail) {