Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gilles Debunne
2012-06-12 10:47:31 -07:00
committed by Android (Google) Code Review
parent aabd9c230f 2fba3387c3
commit a447eaca55
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/text/Layout.java
View File

@@ -456,6 +456,7 @@ public abstract class Layout {
final int top = Math.max(dtop, 0); final int top = Math.max(dtop, 0);
final int bottom = Math.min(getLineTop(getLineCount()), dbottom); final int bottom = Math.min(getLineTop(getLineCount()), dbottom);
if (top >= bottom) return TextUtils.packRangeInLong(0, -1);
return TextUtils.packRangeInLong(getLineForVertical(top), getLineForVertical(bottom)); return TextUtils.packRangeInLong(getLineForVertical(top), getLineForVertical(bottom));
} }