diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-14 17:41:15 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-14 17:41:15 -0800 |
| commit | 725218602e8505cd6fe3075253fcb792727e2431 (patch) | |
| tree | 0254e3e6b5750c34b894c15bec349f5f7326e283 /core/java/android/widget/TextView.java | |
| parent | 7c0f00ccddc96cc6b30e8aa53c5219543523cf48 (diff) | |
| parent | 32929413ffb54b9338a889e764e5cc0608cb2be6 (diff) | |
Merge change I8f657a99 into eclair
* changes:
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 bcdefb346f2b..cdaba8a006cc 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) { |