diff options
| author | Eric Fischer <enf@google.com> | 2009-12-15 07:42:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-15 07:42:03 -0800 |
| commit | 7bbb199912bd4bc7b4827358bcdd90acc826e7fa (patch) | |
| tree | 5c91b11d20970c05e9ff76ad4ecb76c68b230b79 /core/java/android/widget/TextView.java | |
| parent | a7cd86f9ef220be04eb020f9de3fefaf741b791c (diff) | |
| parent | 725218602e8505cd6fe3075253fcb792727e2431 (diff) | |
am 72521860: Merge change I8f657a99 into eclair
Merge commit '725218602e8505cd6fe3075253fcb792727e2431' into eclair-plus-aosp
* commit '725218602e8505cd6fe3075253fcb792727e2431':
Avoid a crash trying to get a substring whose start is after its end.
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 201cc0c84056..455b5932f90a 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -4531,6 +4531,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener // Now use the delta to determine the actual amount of text // we need. partialEndOffset += delta; + if (partialStartOffset > N) { + partialStartOffset = N; + } else if (partialStartOffset < 0) { + partialStartOffset = 0; + } if (partialEndOffset > N) { partialEndOffset = N; } else if (partialEndOffset < 0) { |