am cea3c5bc: am 0a75373f: Merge "Fix a bug where the UserDictionary may not be released" into ics-mr1
* commit 'cea3c5bc17f3e9f09c01b7bf79e8060f6d932f63': Fix a bug where the UserDictionary may not be releasedmain
commit
1fefd7a980
|
@ -179,8 +179,9 @@ public class UserDictionary extends ExpandableDictionary {
|
|||
new Thread("addWord") {
|
||||
@Override
|
||||
public void run() {
|
||||
Cursor cursor = null;
|
||||
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=?))",
|
||||
new String[] { word, mLocale }, null);
|
||||
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
|
||||
// have no means of contacting the content provider any more.
|
||||
// See ContentResolver#insert, inside the catch(){}
|
||||
} finally {
|
||||
if (null != cursor) cursor.close();
|
||||
client.release();
|
||||
}
|
||||
}
|
||||
}.start();
|
||||
|
|
Loading…
Reference in New Issue