From 8c220a0aa2c5139a3b12af20e68c420f6402294a Mon Sep 17 00:00:00 2001
From: Tom Ouyang <ouyang@google.com>
Date: Mon, 3 Sep 2012 17:28:27 -0700
Subject: [PATCH] Fix bug that can cause unexpected off-keyboard chars to
 appear as suggestions.

Bug: 7050587
Change-Id: I59ea659a411ab966380fadd3f7f9df3f0866192f
---
 native/jni/src/proximity_info_state.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/native/jni/src/proximity_info_state.cpp b/native/jni/src/proximity_info_state.cpp
index c9a1ed0c0..4c67ea81c 100644
--- a/native/jni/src/proximity_info_state.cpp
+++ b/native/jni/src/proximity_info_state.cpp
@@ -391,11 +391,12 @@ int ProximityInfoState::getDuration(const int index) const {
 
 float ProximityInfoState::getPointToKeyLength(int inputIndex, int codePoint, float scale) {
     const int keyId = mProximityInfo->getKeyIndexOf(codePoint);
-    if (keyId >= 0) {
+    if (keyId != NOT_AN_INDEX) {
         const int index = inputIndex * mProximityInfo->getKeyCount() + keyId;
         return min(mDistanceCache[index] * scale, mMaxPointToKeyLength);
     }
-    return 0;
+    // If the char is not a key on the keyboard then return the max length.
+    return MAX_POINT_TO_KEY_LENGTH;
 }
 
 int ProximityInfoState::getKeyKeyDistance(int key0, int key1) {