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

am 4d009dbc: am ace7d128: am d445b56c: Fix possible NPE caused while monkey test 

* commit '4d009dbc514cd77eb22e4162e4ae7ea852e1b77e':
  Fix possible NPE caused while monkey test
main
Tadashi G. Takaoka 2012-10-02 22:44:57 -07:00 committed by Android Git Automerger
parent 4ad4ff618f 4d009dbc51
commit 5f5f7825e7
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
View File

@ -390,7 +390,11 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
} }
public int getManualCapsMode() { public int getManualCapsMode() {
switch (getKeyboard().mId.mElementId) { final Keyboard keyboard = getKeyboard();
if (keyboard == null) {
return WordComposer.CAPS_MODE_OFF;
}
switch (keyboard.mId.mElementId) {
case KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCKED: case KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCKED:
case KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCK_SHIFTED: case KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCK_SHIFTED:
return WordComposer.CAPS_MODE_MANUAL_SHIFT_LOCKED; return WordComposer.CAPS_MODE_MANUAL_SHIFT_LOCKED;

8
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -1913,6 +1913,10 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
} }
private SuggestedWords getSuggestedWords(final int sessionId) { private SuggestedWords getSuggestedWords(final int sessionId) {
final Keyboard keyboard = mKeyboardSwitcher.getKeyboard();
if (keyboard == null) {
return SuggestedWords.EMPTY;
}
final String typedWord = mWordComposer.getTypedWord(); final String typedWord = mWordComposer.getTypedWord();
// Get the word on which we should search the bigrams. If we are composing a word, it's // Get the word on which we should search the bigrams. If we are composing a word, it's
// whatever is *before* the half-committed word in the buffer, hence 2; if we aren't, we // whatever is *before* the half-committed word in the buffer, hence 2; if we aren't, we
@ -1922,8 +1926,8 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
mConnection.getNthPreviousWord(mCurrentSettings.mWordSeparators, mConnection.getNthPreviousWord(mCurrentSettings.mWordSeparators,
mWordComposer.isComposingWord() ? 2 : 1); mWordComposer.isComposingWord() ? 2 : 1);
final SuggestedWords suggestedWords = mSuggest.getSuggestedWords(mWordComposer, final SuggestedWords suggestedWords = mSuggest.getSuggestedWords(mWordComposer,
prevWord, mKeyboardSwitcher.getKeyboard().getProximityInfo(), prevWord, keyboard.getProximityInfo(), mCurrentSettings.mCorrectionEnabled,
mCurrentSettings.mCorrectionEnabled, sessionId); sessionId);
return maybeRetrieveOlderSuggestions(typedWord, suggestedWords); return maybeRetrieveOlderSuggestions(typedWord, suggestedWords);
} }

18
java/src/com/android/inputmethod/latin/WordComposer.java
View File

@ -177,14 +177,16 @@ public final class WordComposer {
* Internal method to retrieve reasonable proximity info for a character. * Internal method to retrieve reasonable proximity info for a character.
*/ */
private void addKeyInfo(final int codePoint, final Keyboard keyboard) { private void addKeyInfo(final int codePoint, final Keyboard keyboard) {
final Key key = keyboard.getKey(codePoint); final int x, y;
if (key != null) { final Key key;
final int x = key.mX + key.mWidth / 2; if (keyboard != null && (key = keyboard.getKey(codePoint)) != null) {
final int y = key.mY + key.mHeight / 2; x = key.mX + key.mWidth / 2;
add(codePoint, x, y); y = key.mY + key.mHeight / 2;
return; } else {
x = Constants.NOT_A_COORDINATE;
y = Constants.NOT_A_COORDINATE;
} }
add(codePoint, Constants.NOT_A_COORDINATE, Constants.NOT_A_COORDINATE); add(codePoint, x, y);
} }
/** /**
@ -195,7 +197,7 @@ public final class WordComposer {
reset(); reset();
final int length = word.length(); final int length = word.length();
for (int i = 0; i < length; i = Character.offsetByCodePoints(word, i, 1)) { for (int i = 0; i < length; i = Character.offsetByCodePoints(word, i, 1)) {
int codePoint = Character.codePointAt(word, i); final int codePoint = Character.codePointAt(word, i);
addKeyInfo(codePoint, keyboard); addKeyInfo(codePoint, keyboard);
} }
mIsResumed = true; mIsResumed = true;