summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2012-05-25 12:43:39 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-25 12:43:39 -0700
commit18afc622c3d80713a6ffb91792cce399e1715bfb (patch)
tree38beb8c0aa69a95013b0944c5a470a50c8429b2a
parentbc1387b11c530a751c1c6075d16cac2e48a4b932 (diff)
parent2427192e58b2ff31c3238b6c04440a15f4e7bf20 (diff)
downloadframeworks_base-18afc622c3d80713a6ffb91792cce399e1715bfb.zip
frameworks_base-18afc622c3d80713a6ffb91792cce399e1715bfb.tar.gz
frameworks_base-18afc622c3d80713a6ffb91792cce399e1715bfb.tar.bz2
Merge "Fix for IOOB in SearchView" into jb-dev
-rw-r--r--core/java/android/widget/SearchView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java
index 521597b..8f3a311 100644
--- a/core/java/android/widget/SearchView.java
+++ b/core/java/android/widget/SearchView.java
@@ -511,7 +511,7 @@ public class SearchView extends LinearLayout implements CollapsibleActionView {
public void setQuery(CharSequence query, boolean submit) {
mQueryTextView.setText(query);
if (query != null) {
- mQueryTextView.setSelection(query.length());
+ mQueryTextView.setSelection(mQueryTextView.length());
mUserQuery = query;
}