Revert "Workaround to avoid a bug in the batch input bigram dictionary lookup" (5e21ea1a) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+4 −8

Original line number	Diff line number	Diff line
		@@ -111,14 +111,9 @@ public class BinaryDictionary extends Dictionary {
		Arrays.fill(mInputCodes, WordComposer.NOT_A_CODE);
		Arrays.fill(mOutputChars, (char) 0);
		Arrays.fill(mOutputScores, 0);
		final boolean isGesture = composer.isBatchMode();
		final boolean isValidPrevWord = (prevWord == null)
		// TODO: Remove this check. Unfortunately the current gesture recognition code has
		// a double-free bug.
		&& !isGesture;
		// TODO: toLowerCase in the native code
		final int[] prevWordCodePointArray = isValidPrevWord
		? StringUtils.toCodePointArray(prevWord.toString()) : null;
		final int[] prevWordCodePointArray = (null == prevWord)
		? null : StringUtils.toCodePointArray(prevWord.toString());
		final int composerSize = composer.size();

		if (composerSize <= 1 \|\| !composer.isBatchMode()) {
		@@ -129,7 +124,7 @@ public class BinaryDictionary extends Dictionary {
		}

		final int count;
		if (!isGesture && composer.size() <= 1) {
		if (!composer.isBatchMode() && composer.size() <= 1) {
		if (TextUtils.isEmpty(prevWord)) return null;
		int tmpCount = getBigramsNative(mNativeDict, prevWordCodePointArray,
		prevWordCodePointArray.length, mInputCodes, composerSize,
		@@ -137,6 +132,7 @@ public class BinaryDictionary extends Dictionary {
		count = Math.min(tmpCount, MAX_BIGRAMS);
		} else {
		final InputPointers ips = composer.getInputPointers();
		final boolean isGesture = composer.isBatchMode();
		final int codesSize;
		if (isGesture) {
		codesSize = ips.getPointerSize();