commit 7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8
author Eric Laurent <elaurent@google.com> Thu Sep 23 11:07:06 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 23 11:07:06 2010 -0700
tree c4ff6e67f0a572f06135aa6e225a793b97aaa594
parent 6e98c280f792932d60bf9374c8979d9eadce2d9c
parent 1a5149e5d7f2dddc8b324f7695e69fd89af73c52

Merge "Fix issue 3022800." into gingerbread

core/java/android/view/inputmethod/BaseInputConnection.java

diff --git a/core/java/android/view/inputmethod/BaseInputConnection.java b/core/java/android/view/inputmethod/BaseInputConnection.java
index 3801948..f7c869b 100644
--- a/core/java/android/view/inputmethod/BaseInputConnection.java
+++ b/core/java/android/view/inputmethod/BaseInputConnection.java
@@ -428,8 +428,12 @@
                 a = b;
                 b = tmp;
             }
+            // Clip the end points to be within the content bounds.
+            final int length = content.length();
             if (a < 0) a = 0;
-            if (b > content.length()) b = content.length();
+            if (b < 0) b = 0;
+            if (a > length) a = length;
+            if (b > length) b = length;
 
             ensureDefaultComposingSpans();
             if (mDefaultComposingSpans != null) {