Fix: Read lock is wrongly used for gutSuggestions. (cfbb7fbd) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -196,7 +196,8 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
		final String prevWord, final ProximityInfo proximityInfo,
		final boolean blockOffensiveWords) {
		asyncReloadDictionaryIfRequired();
		if (mLocalDictionaryController.readLock().tryLock()) {
		// Write lock because getSuggestions in native updates session status.
		if (mLocalDictionaryController.writeLock().tryLock()) {
		try {
		final ArrayList<SuggestedWordInfo> inMemDictSuggestion =
		mDictionaryWriter.getSuggestions(composer, prevWord, proximityInfo,
		@@ -217,7 +218,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
		return inMemDictSuggestion;
		}
		} finally {
		mLocalDictionaryController.readLock().unlock();
		mLocalDictionaryController.writeLock().unlock();
		}
		}
		return null;