diff options
| author | 2015-07-10 18:37:43 +0000 | |
|---|---|---|
| committer | 2015-07-10 18:37:49 +0000 | |
| commit | 5d1654a9439f0ed81ecccecfacda34872270dfcb (patch) | |
| tree | 32daecefa51ea8d8adb3b8348b2234adf59a2656 | |
| parent | 1570b6b3c7d1d41a52555312d161d0afe4b81df3 (diff) | |
| parent | 04a84559fd11b36196872b1ac0cb82e5f7367806 (diff) | |
Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev
| -rw-r--r-- | core/java/android/text/StaticLayout.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index cdff395a3fa9..efc9e1ae4aa6 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -744,7 +744,8 @@ public class StaticLayout extends Layout { && (ellipsize == TextUtils.TruncateAt.END || (mMaximumVisibleLineCount == 1 && ellipsize != TextUtils.TruncateAt.MARQUEE)); - if (remainingLineCount < breakCount && ellipsisMayBeApplied) { + if (remainingLineCount > 0 && remainingLineCount < breakCount && + ellipsisMayBeApplied) { // Treat the last line and overflowed lines as a single line. breaks[remainingLineCount - 1] = breaks[breakCount - 1]; // Calculate width and flag. |