From e33813932474f760073f92bdb7bbf93d1b923d70 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Mon, 8 Mar 2010 09:20:31 -0800 Subject: [PATCH] Fixes monkey bug: 2292396 --- src/com/android/settings/UserDictionarySettings.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java index 4b30b5333bd..6ffcb3d6bcc 100644 --- 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)); }