From 62dbd82aad0f84c88212566321e3fb370affaf7c Mon Sep 17 00:00:00 2001
From: Gilles Debunne <debunne@google.com>
Date: Thu, 26 Aug 2010 11:09:10 -0700
Subject: Fix for IndexOutOfBounds in TextView getWordLimitsAt.

Bug http://b/issue?id=2948904

Change-Id: I10008374da92d5a98ec567cc76732383e66c4c5b
---
 core/java/android/widget/TextView.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 8ab8f9d8570c..248f6eb39aed 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);
-- 
cgit v1.2.3-59-g8ed1b