Fix: Bug of I39e905b6ddfc8d3.
primaryKey have to be the first elemnet of the proximities. Bug: 13315755 Change-Id: I6c94408a2ef2750fa85ff12b93bed8b8d874717e
This commit is contained in:
parent
4da06b9a19
commit
9fd50e34a8
1 changed files with 6 additions and 3 deletions
|
@ -164,12 +164,15 @@ class ProximityInfoUtils {
|
||||||
const int gridWidth, const int mostCommonKeyWidth, const int keyCount,
|
const int gridWidth, const int mostCommonKeyWidth, const int keyCount,
|
||||||
const int x, const int y, const int primaryKey, const char *const localeStr,
|
const int x, const int y, const int primaryKey, const char *const localeStr,
|
||||||
const hash_map_compat<int, int> *const codeToKeyMap, int *proximities) {
|
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;
|
const int mostCommonKeyWidthSquare = mostCommonKeyWidth * mostCommonKeyWidth;
|
||||||
int insertPos = 0;
|
int insertPos = 0;
|
||||||
proximities[insertPos++] = primaryKey;
|
proximities[insertPos++] = primaryKey;
|
||||||
|
if (x == NOT_A_COORDINATE || y == NOT_A_COORDINATE) {
|
||||||
|
for (int i = insertPos; i < MAX_PROXIMITY_CHARS_SIZE; ++i) {
|
||||||
|
proximities[i] = NOT_A_CODE_POINT;
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
const int startIndex = getStartIndexFromCoordinates(x, y, cellHeight, cellWidth, gridWidth);
|
const int startIndex = getStartIndexFromCoordinates(x, y, cellHeight, cellWidth, gridWidth);
|
||||||
if (startIndex >= 0) {
|
if (startIndex >= 0) {
|
||||||
for (int i = 0; i < MAX_PROXIMITY_CHARS_SIZE; ++i) {
|
for (int i = 0; i < MAX_PROXIMITY_CHARS_SIZE; ++i) {
|
||||||
|
|
Loading…
Reference in a new issue