aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorKeisuke Kuroynagi <ksk@google.com>2013-07-04 08:14:58 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-04 08:14:58 -0700
commit89ca0e13d162a312533e10e478a48b003446b17d (patch)
treee635688530265ed881f374bc1cc78acfa1757f20 /java/src
parent2e22356da44e4179fd570a9a113dfd6c9fbf829d (diff)
parent49910a9d774120479d89f537c7e1b4d43e6f153a (diff)
downloadlatinime-89ca0e13d162a312533e10e478a48b003446b17d.tar.gz
latinime-89ca0e13d162a312533e10e478a48b003446b17d.tar.xz
latinime-89ca0e13d162a312533e10e478a48b003446b17d.zip
am 49910a9d: Merge "Fix: release lock in UserHistoryDictionary."
* commit '49910a9d774120479d89f537c7e1b4d43e6f153a': Fix: release lock in UserHistoryDictionary.
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/UserHistoryDictionary.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java b/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java
index ca2d8840b..8c668b810 100644
--- a/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java
@@ -320,7 +320,11 @@ public final class UserHistoryDictionary extends ExpandableDictionary {
mUserHistoryDictionary.mBigramListLock.unlock();
}
} else if (mUserHistoryDictionary.mBigramListLock.tryLock()) {
- doWriteTaskLocked();
+ try {
+ doWriteTaskLocked();
+ } finally {
+ mUserHistoryDictionary.mBigramListLock.unlock();
+ }
}
return null;
}