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

am 5bb2e9a5: am b24cc640: Fix ArrayIndexOutOfBoundsException.

Browse source 
Merge commit '5bb2e9a55de237e1955ac1fd19eea3771e671afe'

* commit '5bb2e9a55de237e1955ac1fd19eea3771e671afe':
  Fix ArrayIndexOutOfBoundsException.
This commit is contained in:
Ken Wakasa 2010-08-31 17:22:49 -07:00 committed by Android Git Automerger
commit 890c1d5fa3
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
View file

@ -500,8 +500,9 @@ public class LatinKeyboardBaseView extends View implements View.OnClickListener
if (!wasInKeyRepeat && !mProxy.isMiniKeyboardOnScreen()) { if (!wasInKeyRepeat && !mProxy.isMiniKeyboardOnScreen()) {
detectAndSendKey(mCurrentKey, touchX, touchY, eventTime); detectAndSendKey(mCurrentKey, touchX, touchY, eventTime);
} }
if (keyIndex != NOT_A_KEY) if (keyIndex != NOT_A_KEY && keyIndex < mKeys.length) {
mProxy.invalidateKey(mKeys[keyIndex]); mProxy.invalidateKey(mKeys[keyIndex]);
}
} }
public void onCancelEvent(int touchX, int touchY, long eventTime) { public void onCancelEvent(int touchX, int touchY, long eventTime) {
@ -509,8 +510,9 @@ public class LatinKeyboardBaseView extends View implements View.OnClickListener
mHandler.cancelPopupPreview(); mHandler.cancelPopupPreview();
mProxy.dismissPopupKeyboard(); mProxy.dismissPopupKeyboard();
showKeyPreviewAndUpdateKey(NOT_A_KEY); showKeyPreviewAndUpdateKey(NOT_A_KEY);
if (mCurrentKey != NOT_A_KEY) if (mCurrentKey != NOT_A_KEY && mCurrentKey < mKeys.length) {
mProxy.invalidateKey(mKeys[mCurrentKey]); mProxy.invalidateKey(mKeys[mCurrentKey]);
}
} }
public void repeatKey(int keyIndex) { public void repeatKey(int keyIndex) {
@ -670,7 +672,7 @@ public class LatinKeyboardBaseView extends View implements View.OnClickListener
} }
private void checkMultiTap(long eventTime, int keyIndex) { private void checkMultiTap(long eventTime, int keyIndex) {
if (keyIndex == NOT_A_KEY) return; if (keyIndex == NOT_A_KEY || keyIndex >= mKeys.length) return;
Key key = mKeys[keyIndex]; Key key = mKeys[keyIndex];
if (key.codes.length > 1) { if (key.codes.length > 1) {
mInMultiTap = true; mInMultiTap = true;