Fixes monkey bug: 2292396

2010-03-08 09:20:31 -08:00
parent f39a7f78b1
commit e338139324
1 changed files with 5 additions and 1 deletions
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -159,7 +159,8 @@ public class UserDictionarySettings extends ListActivity {
        
        AdapterContextMenuInfo adapterMenuInfo = (AdapterContextMenuInfo) menuInfo;
        String word = getWord(adapterMenuInfo.position);
-        
+        if (word == null) return true;
+
        switch (item.getItemId()) {
            case CONTEXT_MENU_DELETE:
                deleteWord(word);
@@ -193,6 +194,9 @@ public class UserDictionarySettings extends ListActivity {
    
    private String getWord(int position) {
        mCursor.moveToPosition(position);
+        // Handle a possible race-condition
+        if (mCursor.isAfterLast()) return null;
+
        return mCursor.getString(
                mCursor.getColumnIndexOrThrow(UserDictionary.Words.WORD));
    }