Merge "Fix: NPE after onDestroy()." (a09b9cea) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -269,6 +269,9 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
		}

		private void runGCAfterAllPrioritizedTasksIfRequiredLocked(final boolean mindsBlockByGC) {
		if (mBinaryDictionary == null) {
		return;
		}
		// needsToRunGC() have to be called with lock.
		if (mBinaryDictionary.needsToRunGC(mindsBlockByGC)) {
		if (setProcessingLargeTaskIfNot()) {
		@@ -357,6 +360,9 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
		public void run() {
		final boolean locked = setProcessingLargeTaskIfNot();
		try {
		if (mBinaryDictionary == null) {
		return;
		}
		mBinaryDictionary.addMultipleDictionaryEntries(
		languageModelParams.toArray(
		new LanguageModelParam[languageModelParams.size()]));
		@@ -496,6 +502,9 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
		}

		private void flushDictionaryLocked() {
		if (mBinaryDictionary == null) {
		return;
		}
		if (mBinaryDictionary.needsToRunGC(false /* mindsBlockByGC */)) {
		mBinaryDictionary.flushWithGC();
		} else {

+6 −0

Original line number	Diff line number	Diff line
		@@ -110,6 +110,9 @@ public final class LanguageModelParam {
		final LanguageModelParam languageModelParam =
		detectWhetherVaildWordOrNotAndGetLanguageModelParam(
		prevWord, tempWord, timestamp, dictionaryFacilitator);
		if (languageModelParam == null) {
		continue;
		}
		languageModelParams.add(languageModelParam);
		prevWord = languageModelParam.mTargetWord;
		}
		@@ -120,6 +123,9 @@ public final class LanguageModelParam {
		final String prevWord, final String targetWord, final int timestamp,
		final DictionaryFacilitatorForSuggest dictionaryFacilitator) {
		final Locale locale = dictionaryFacilitator.getLocale();
		if (locale == null) {
		return null;
		}
		if (!dictionaryFacilitator.isValidWord(targetWord, true /* ignoreCase */)) {
		// OOV word.
		return createAndGetLanguageModelParamOfWord(prevWord, targetWord, timestamp,