commit 725218602e8505cd6fe3075253fcb792727e2431
author Android (Google) Code Review <android-gerrit@google.com> Mon Dec 14 17:41:15 2009 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 14 17:41:15 2009 -0800
tree 0254e3e6b5750c34b894c15bec349f5f7326e283
parent 7c0f00ccddc96cc6b30e8aa53c5219543523cf48
parent 32929413ffb54b9338a889e764e5cc0608cb2be6

Merge change I8f657a99 into eclair

* changes:
  Avoid a crash trying to get a substring whose start is after its end.

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index bcdefb3..cdaba8a 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -4531,6 +4531,11 @@
                     // 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) {