am 6ee1bd42: Merge "Keep addWordToDictionary from doing disk I/O on main thread" into gingerbread

Merge commit '6ee1bd425bc44d91dbb151e999e9781bc301e632' into gingerbread-plus-aosp

* commit '6ee1bd425bc44d91dbb151e999e9781bc301e632':
  Keep addWordToDictionary from doing disk I/O on main thread

1 files changed, 8 insertions, 2 deletions

diff --git a/java/src/com/android/inputmethod/latin/UserDictionary.java b/java/src/com/android/inputmethod/latin/UserDictionary.java
index 3315cf6c9..49b95e9aa 100644
--- a/java/src/com/android/inputmethod/latin/UserDictionary.java
+++ b/java/src/com/android/inputmethod/latin/UserDictionary.java
@@ -89,13 +89,19 @@ public class UserDictionary extends ExpandableDictionary {
         super.addWord(word, frequency);
 
         // Update the user dictionary provider
-        ContentValues values = new ContentValues(5);
+        final ContentValues values = new ContentValues(5);
         values.put(Words.WORD, word);
         values.put(Words.FREQUENCY, frequency);
         values.put(Words.LOCALE, mLocale);
         values.put(Words.APP_ID, 0);
 
-        getContext().getContentResolver().insert(Words.CONTENT_URI, values);
+        final ContentResolver contentResolver = getContext().getContentResolver();
+        new Thread("addWord") {
+            public void run() {
+                contentResolver.insert(Words.CONTENT_URI, values);
+            }
+        }.start();
+
         // In case the above does a synchronous callback of the change observer
         setRequiresReload(false);
     }