diff options
| author | 2015-07-10 18:48:36 +0000 | |
|---|---|---|
| committer | 2015-07-10 18:48:36 +0000 | |
| commit | 9320bb082f53dfdf34881907a736527b3bdd9b45 (patch) | |
| tree | 1d5140f8a0daf19c920a937f028e43a1e38079c2 | |
| parent | 66f59dc1bde15be207d49fafb97db372cb01d977 (diff) | |
| parent | 5d1654a9439f0ed81ecccecfacda34872270dfcb (diff) | |
am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev
* commit '5d1654a9439f0ed81ecccecfacda34872270dfcb':
Fix StaticLayout crash when maxLines = 0
| -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. |