commit 2cbc7c682d003c97431235fedbfd21e8473e180c
author Ken Wakasa <kwakasa@google.com> Thu Aug 29 08:11:20 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 29 08:11:21 2013 +0000
tree c12d285de00bdb2f7ae367ec7a07ff95c4903202
parent e9e8d2d986bb3874caa8ee8c742aa0caa37eaf87
parent 4994e1f2ba669c8636f028594cfc8f757f44d374

Merge "Workaround for AIOOB exception in ProximityInfo"

java/src/com/android/inputmethod/keyboard/ProximityInfo.java

diff --git a/java/src/com/android/inputmethod/keyboard/ProximityInfo.java b/java/src/com/android/inputmethod/keyboard/ProximityInfo.java
index c0c02f1..cd127c7 100644
--- a/java/src/com/android/inputmethod/keyboard/ProximityInfo.java
+++ b/java/src/com/android/inputmethod/keyboard/ProximityInfo.java
@@ -342,7 +342,9 @@
             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];
                     }