From eb4f8506d681a41c7d7a2cb295882073642ea698 Mon Sep 17 00:00:00 2001
From: Xiaojun Bi <bxj@google.com>
Date: Tue, 13 May 2014 20:43:15 -0700
Subject: [PATCH] Fix a NPE in
DistracterFilter.isDistracterToWordsInDictionaries()
Bug: 14904706
Change-Id: I3b52bb01b9c59cbba2eba0bd1d91dffb4419c019
---
.../inputmethod/latin/utils/DistracterFilter.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/java/src/com/android/inputmethod/latin/utils/DistracterFilter.java b/java/src/com/android/inputmethod/latin/utils/DistracterFilter.java
index 55cbf79b35..f0963f7b17 100644
--- a/java/src/com/android/inputmethod/latin/utils/DistracterFilter.java
+++ b/java/src/com/android/inputmethod/latin/utils/DistracterFilter.java
@@ -90,19 +90,14 @@ public class DistracterFilter {
*/
public boolean isDistracterToWordsInDictionaries(final String prevWord,
final String testedWord) {
- if (mSuggest == null) {
+ if (mSuggest == null || mKeyboard == null) {
return false;
}
final WordComposer composer = new WordComposer();
final int[] codePoints = StringUtils.toCodePointArray(testedWord);
final int[] coordinates;
- if (null == mKeyboard) {
- coordinates = CoordinateUtils.newCoordinateArray(codePoints.length,
- Constants.NOT_A_COORDINATE, Constants.NOT_A_COORDINATE);
- } else {
- coordinates = mKeyboard.getCoordinates(codePoints);
- }
+ coordinates = mKeyboard.getCoordinates(codePoints);
composer.setComposingWord(codePoints, coordinates, prevWord);
final int trailingSingleQuotesCount = composer.trailingSingleQuotesCount();
--
GitLab