commit bdbefac0b471e8a70c5d4958b8d1a345777d6bdb
author Tadashi G. Takaoka <takaoka@google.com> Fri Jun 10 07:46:48 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 10 07:46:48 2011 -0700
tree f2b9bd74466ac86d771a20c25a2b829fe1786ecf
parent 08c85e8a02f8ea369c0a9d2e1fd639df225b6230
parent 263749f2dc5d1cb885786afbccbb19ae6847c204

am 263749f2: am 37deb112: Fix IndexOutOfBoundsException

* commit '263749f2dc5d1cb885786afbccbb19ae6847c204':
  Fix IndexOutOfBoundsException

java/src/com/android/inputmethod/latin/CandidateView.java

diff --git a/java/src/com/android/inputmethod/latin/CandidateView.java b/java/src/com/android/inputmethod/latin/CandidateView.java
index 5719b90..c52f6b2 100644
--- a/java/src/com/android/inputmethod/latin/CandidateView.java
+++ b/java/src/com/android/inputmethod/latin/CandidateView.java
@@ -332,8 +332,10 @@
 
     @Override
     public boolean onLongClick(View view) {
-        int index = (Integer) view.getTag();
-        CharSequence word = mSuggestions.getWord(index);
+        final int index = (Integer) view.getTag();
+        if (index >= mSuggestions.size())
+            return true;
+        final CharSequence word = mSuggestions.getWord(index);
         if (word.length() < 2)
             return false;
         addToDictionary(word);
@@ -342,8 +344,10 @@
 
     @Override
     public void onClick(View view) {
-        int index = (Integer) view.getTag();
-        CharSequence word = mSuggestions.getWord(index);
+        final int index = (Integer) view.getTag();
+        if (index >= mSuggestions.size())
+            return;
+        final CharSequence word = mSuggestions.getWord(index);
         if (mShowingAddToDictionary && index == 0) {
             addToDictionary(word);
         } else {