nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 2cbc7c68: Merge "Workaround for AIOOB exception in ProximityInfo" 

* commit '2cbc7c682d003c97431235fedbfd21e8473e180c':
  Workaround for AIOOB exception in ProximityInfo
main
Ken Wakasa 2013-08-29 01:34:23 -07:00 committed by Android Git Automerger
parent b619acfdc6 2cbc7c682d
commit f0229f223b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/com/android/inputmethod/keyboard/ProximityInfo.java
View File

@ -342,7 +342,9 @@ y |---+---+---+---+-v-+-|-+---+---+---+---+---| | thresholdBase and get
for (int centerY = yStart; centerY <= yEnd; centerY += mCellHeight) { for (int centerY = yStart; centerY <= yEnd; centerY += mCellHeight) {
int index = baseIndexOfCurrentRow; int index = baseIndexOfCurrentRow;
for (int centerX = xStart; centerX <= xEnd; centerX += mCellWidth) { 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; neighborsFlatBuffer[index * keyCount + neighborCountPerCell[index]] = key;
++neighborCountPerCell[index]; ++neighborCountPerCell[index];
} }