commit 3377b404b82403c4c137c699088eb09c4b806dba
author Raph Levien <raph@google.com> Tue Oct 16 14:44:17 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 16 14:44:18 2012 -0700
tree b3464759800fd6eb96796e049844f03199d05588
parent 964629aca8d076826198a21b654ed858618b5619
parent 8b17969c64b5d8749b901784b61dc7c165ee98be

Merge "Fix for bug 7358703 Gmail ANR when trying to compose a message" into jb-mr1-dev

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 751ed7c..8e5ff40 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -6321,7 +6321,7 @@
         if (mDeferScroll >= 0) {
             int curs = mDeferScroll;
             mDeferScroll = -1;
-            bringPointIntoView(curs);
+            bringPointIntoView(Math.min(curs, mText.length()));
         }
         if (changed && mEditor != null) mEditor.invalidateTextDisplayList();
     }