Handle empty previous ngram context correctly.

Fixes bug where empty previous ngram context not at the
beginning of a sentence incorrectly returned the
beginning-of-sentence marker.

Bug: 19612336
Change-Id: I5ddf3408e20dcedf70487b85c983cd3fc12550e7

1 files changed, 2 insertions, 5 deletions

diff --git a/java/src/com/android/inputmethod/latin/NgramContext.java b/java/src/com/android/inputmethod/latin/NgramContext.java
index c9351586e..aeeff6126 100644
--- a/java/src/com/android/inputmethod/latin/NgramContext.java
+++ b/java/src/com/android/inputmethod/latin/NgramContext.java
@@ -142,8 +142,7 @@ public class NgramContext {
                 }
             }
         }
-        return terms.size() == 0 ? BEGINNING_OF_SENTENCE_TAG
-                : TextUtils.join(CONTEXT_SEPARATOR, terms);
+        return TextUtils.join(CONTEXT_SEPARATOR, terms);
     }
 
     /**
@@ -166,9 +165,7 @@ public class NgramContext {
                 }
             }
         }
-        final String[] contextStringArray = prevTermList.size() == 0 ?
-                new String[] { BEGINNING_OF_SENTENCE_TAG }
-                : prevTermList.toArray(new String[prevTermList.size()]);
+        final String[] contextStringArray = prevTermList.toArray(new String[prevTermList.size()]);
         return contextStringArray;
     }