summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-08-26 11:09:10 -0700
committerGilles Debunne <debunne@google.com>2010-08-26 11:12:16 -0700
commit62dbd82aad0f84c88212566321e3fb370affaf7c (patch)
treef27f86e8c448e6860ac017a24c6f373dd28b24a9 /core/java/android/widget/TextView.java
parentc6d7a8953de9dd4e0af1dca69d83d810c05d809d (diff)
downloadframeworks_base-62dbd82aad0f84c88212566321e3fb370affaf7c.zip
frameworks_base-62dbd82aad0f84c88212566321e3fb370affaf7c.tar.gz
frameworks_base-62dbd82aad0f84c88212566321e3fb370affaf7c.tar.bz2
Fix for IndexOutOfBounds in TextView getWordLimitsAt.
Bug http://b/issue?id=2948904 Change-Id: I10008374da92d5a98ec567cc76732383e66c4c5b
Diffstat (limited to 'core/java/android/widget/TextView.java')
-rw-r--r--core/java/android/widget/TextView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 8ab8f9d..248f6eb 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -7047,14 +7047,14 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
return -1;
}
- int end = offset;
+ int len = mText.length();
+ int end = Math.min(offset, len);
if (end < 0) {
return -1;
}
int start = end;
- int len = mText.length();
for (; start > 0; start--) {
char c = mTransformed.charAt(start - 1);