Merge "Fix for IOOB in SearchView" into jb-dev

Gilles Debunne · Android (Google) Code Review · commit 18afc622c3d8 · 2012-05-25T12:43:39.000-07:00
diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java
@@ -511,7 +511,7 @@ public CharSequence getQuery() {
     public void setQuery(CharSequence query, boolean submit) {
         mQueryTextView.setText(query);
         if (query != null) {
-            mQueryTextView.setSelection(query.length());
+            mQueryTextView.setSelection(mQueryTextView.length());
             mUserQuery = query;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,7 @@ public CharSequence getQuery() {`
`511`	`511`	`public void setQuery(CharSequence query, boolean submit) {`
`512`	`512`	`mQueryTextView.setText(query);`
`513`	`513`	`if (query != null) {`
`514`		`- mQueryTextView.setSelection(query.length());`
	`514`	`+ mQueryTextView.setSelection(mQueryTextView.length());`
`515`	`515`	`mUserQuery = query;`
`516`	`516`	`}`
`517`	`517`