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

2012-10-16 14:44:17 -07:00
parent 964629aca8 8b17969c64
commit 3377b404b8
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -6321,7 +6321,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
        if (mDeferScroll >= 0) {
            int curs = mDeferScroll;
            mDeferScroll = -1;
-            bringPointIntoView(curs);
+            bringPointIntoView(Math.min(curs, mText.length()));
        }
        if (changed && mEditor != null) mEditor.invalidateTextDisplayList();
    }