aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2014-03-05 02:29:35 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-05 02:29:35 -0800
commit3b14961f20d0cfa046c68ac81562e24ff4f0196d (patch)
treec9c42f94d8962da90965ff49fa7309b49f11c4c9
parent99bba3ee1bdf81ce97835ca7568ad0ec74cccc96 (diff)
parenta84f7848d8da240137ca57a8e2100e6b09bfc7aa (diff)
downloadlatinime-3b14961f20d0cfa046c68ac81562e24ff4f0196d.tar.gz
latinime-3b14961f20d0cfa046c68ac81562e24ff4f0196d.tar.xz
latinime-3b14961f20d0cfa046c68ac81562e24ff4f0196d.zip
am a84f7848: Merge "Fix: The top left key is a proximity of nonexistent keys."
* commit 'a84f7848d8da240137ca57a8e2100e6b09bfc7aa': Fix: The top left key is a proximity of nonexistent keys.
-rw-r--r--native/jni/src/suggest/core/layout/proximity_info_utils.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/native/jni/src/suggest/core/layout/proximity_info_utils.h b/native/jni/src/suggest/core/layout/proximity_info_utils.h
index 0e28560fc..bc8d5bc1d 100644
--- a/native/jni/src/suggest/core/layout/proximity_info_utils.h
+++ b/native/jni/src/suggest/core/layout/proximity_info_utils.h
@@ -164,6 +164,9 @@ class ProximityInfoUtils {
const int gridWidth, const int mostCommonKeyWidth, const int keyCount,
const int x, const int y, const int primaryKey, const char *const localeStr,
const hash_map_compat<int, int> *const codeToKeyMap, int *proximities) {
+ if (x == NOT_A_COORDINATE || y == NOT_A_COORDINATE) {
+ return;
+ }
const int mostCommonKeyWidthSquare = mostCommonKeyWidth * mostCommonKeyWidth;
int insertPos = 0;
proximities[insertPos++] = primaryKey;