diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-08-29 08:11:20 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-08-29 08:11:21 +0000 |
| commit | 2cbc7c682d003c97431235fedbfd21e8473e180c (patch) | |
| tree | c12d285de00bdb2f7ae367ec7a07ff95c4903202 /java | |
| parent | e9e8d2d986bb3874caa8ee8c742aa0caa37eaf87 (diff) | |
| parent | 4994e1f2ba669c8636f028594cfc8f757f44d374 (diff) | |
| download | latinime-2cbc7c682d003c97431235fedbfd21e8473e180c.tar.gz latinime-2cbc7c682d003c97431235fedbfd21e8473e180c.tar.xz latinime-2cbc7c682d003c97431235fedbfd21e8473e180c.zip | |
Merge "Workaround for AIOOB exception in ProximityInfo"
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/ProximityInfo.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/ProximityInfo.java b/java/src/com/android/inputmethod/keyboard/ProximityInfo.java index c0c02f10a..cd127c760 100644 --- a/java/src/com/android/inputmethod/keyboard/ProximityInfo.java +++ b/java/src/com/android/inputmethod/keyboard/ProximityInfo.java @@ -342,7 +342,9 @@ y |---+---+---+---+-v-+-|-+---+---+---+---+---| | thresholdBase and get for (int centerY = yStart; centerY <= yEnd; centerY += mCellHeight) { int index = baseIndexOfCurrentRow; for (int centerX = xStart; centerX <= xEnd; centerX += mCellWidth) { - if (key.squaredDistanceToEdge(centerX, centerY) < thresholdSquared) { + // TODO: Remove "index < neighborCountPerCell.length" below. + if (index < neighborCountPerCell.length + && key.squaredDistanceToEdge(centerX, centerY) < thresholdSquared) { neighborsFlatBuffer[index * keyCount + neighborCountPerCell[index]] = key; ++neighborCountPerCell[index]; } |