aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2012-09-04 02:36:34 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-04 02:36:35 -0700
commit2e4713a54ed38a18f39ef0d52431459c8210dc40 (patch)
tree2b1a8e068ad617e4c64fadc5bc13e385607bdcec /java/src
parent613aab230d7146e6d93c76a271d2d669de7d7836 (diff)
parentdd435b305e1b69817c8f714572e6161f66111997 (diff)
downloadlatinime-2e4713a54ed38a18f39ef0d52431459c8210dc40.tar.gz
latinime-2e4713a54ed38a18f39ef0d52431459c8210dc40.tar.xz
latinime-2e4713a54ed38a18f39ef0d52431459c8210dc40.zip
Merge "Check the length of the word when add to userhistory." into jb-mr1-dev
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/UserHistoryDictionary.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java b/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java
index 6c9d1c250..683ee4f5c 100644
--- a/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java
@@ -182,6 +182,10 @@ public class UserHistoryDictionary extends ExpandableDictionary {
* The second word may not be null (a NullPointerException would be thrown).
*/
public int addToUserHistory(final String word1, String word2, boolean isValid) {
+ if (word2.length() >= BinaryDictionary.MAX_WORD_LENGTH ||
+ (word1 != null && word1.length() >= BinaryDictionary.MAX_WORD_LENGTH)) {
+ return -1;
+ }
if (mBigramListLock.tryLock()) {
try {
super.addWord(