nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 0a75373f: Merge "Fix a bug where the UserDictionary may not be released" into ics-mr1 

* commit '0a75373f4187d2db036757c2c2bcaba42301fd22':
  Fix a bug where the UserDictionary may not be released
main
Ken Wakasa 2011-11-07 23:04:05 +00:00 committed by Android Git Automerger
parent 14c4620529 0a75373f41
commit cea3c5bc17
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/src/com/android/inputmethod/latin/UserDictionary.java
View File

@ -179,8 +179,9 @@ public class UserDictionary extends ExpandableDictionary {
new Thread("addWord") { new Thread("addWord") {
@Override @Override
public void run() { public void run() {
Cursor cursor = null;
try { try {
final Cursor cursor = client.query(Words.CONTENT_URI, PROJECTION_ADD, cursor = client.query(Words.CONTENT_URI, PROJECTION_ADD,
"word=? and ((locale IS NULL) or (locale=?))", "word=? and ((locale IS NULL) or (locale=?))",
new String[] { word, mLocale }, null); new String[] { word, mLocale }, null);
if (cursor != null && cursor.moveToFirst()) { if (cursor != null && cursor.moveToFirst()) {
@ -201,6 +202,9 @@ public class UserDictionary extends ExpandableDictionary {
// If we come here, the activity is already about to be killed, and we // If we come here, the activity is already about to be killed, and we
// have no means of contacting the content provider any more. // have no means of contacting the content provider any more.
// See ContentResolver#insert, inside the catch(){} // See ContentResolver#insert, inside the catch(){}
} finally {
if (null != cursor) cursor.close();
client.release();
} }
} }
}.start(); }.start();