Merge "Prevent a crash when maxLines is set to 0" into jb-dev

2012-06-12 10:47:31 -07:00
parent aabd9c230f 2fba3387c3
commit a447eaca55
1 changed files with 1 additions and 0 deletions
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -456,6 +456,7 @@ public abstract class Layout {
        final int top = Math.max(dtop, 0);
        final int bottom = Math.min(getLineTop(getLineCount()), dbottom);

+        if (top >= bottom) return TextUtils.packRangeInLong(0, -1);
        return TextUtils.packRangeInLong(getLineForVertical(top), getLineForVertical(bottom));
    }