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

raphlinus · Android (Google) Code Review · commit 3377b404b824 · 2012-10-16T14:44:18.000-07:00
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
@@ -6321,7 +6321,7 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
         if (mDeferScroll >= 0) {
             int curs = mDeferScroll;
             mDeferScroll = -1;
-            bringPointIntoView(curs);
+            bringPointIntoView(Math.min(curs, mText.length()));
         }
         if (changed && mEditor != null) mEditor.invalidateTextDisplayList();
     }

Original file line number	Diff line number	Diff line change
`@@ -6321,7 +6321,7 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto`
`6321`	`6321`	`if (mDeferScroll >= 0) {`
`6322`	`6322`	`int curs = mDeferScroll;`
`6323`	`6323`	`mDeferScroll = -1;`
`6324`		`- bringPointIntoView(curs);`
	`6324`	`+ bringPointIntoView(Math.min(curs, mText.length()));`
`6325`	`6325`	`}`
`6326`	`6326`	`if (changed && mEditor != null) mEditor.invalidateTextDisplayList();`
`6327`	`6327`	`}`