Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b21d785 authored by Raph Levien's avatar Raph Levien Committed by Android Git Automerger
Browse files

am c10176a4: am dbcd049a: am 9320bb08: am 5d1654a9: Merge "Fix StaticLayout... 

am c10176a4: am dbcd049a: am 9320bb08: am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev

* commit 'c10176a4':
  Fix StaticLayout crash when maxLines = 0
parents cc5cd900 c10176a4

core/java/android/text/StaticLayout.java

+2 −1
Original line number Diff line number Diff line
@@ -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.