From ac108d5b341f484d48009ba0e90524569bab84f2 Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Fri, 2 Jul 2010 06:36:02 +0900
Subject: [PATCH] Null check at BackToAcceptedDefault
Change-Id: Ib232475520f822bf8613258afb9638e1be50d7f7
---
java/src/com/android/inputmethod/latin/LatinIME.java | 2 +-
java/src/com/android/inputmethod/latin/TextEntryState.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 756cd2327..7612426eb 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1288,7 +1288,7 @@ public class LatinIME extends InputMethodService
doubleSpace();
}
if (pickedDefault) {
- TextEntryState.backToAcceptedDefault();
+ TextEntryState.backToAcceptedDefault(mWord.getTypedWord());
}
updateShiftKeyState(getCurrentInputEditorInfo());
if (ic != null) {
diff --git a/java/src/com/android/inputmethod/latin/TextEntryState.java b/java/src/com/android/inputmethod/latin/TextEntryState.java
index 1a3bb877a..224423c23 100644
--- a/java/src/com/android/inputmethod/latin/TextEntryState.java
+++ b/java/src/com/android/inputmethod/latin/TextEntryState.java
@@ -138,7 +138,8 @@ public class TextEntryState {
// STATE_ACCEPTED_DEFAULT will be changed to other sub-states
// (see "case STATE_ACCEPTED_DEFAULT" in typedCharacter() below),
// and should be restored back to STATE_ACCEPTED_DEFAULT after processing for each sub-state.
- public static void backToAcceptedDefault() {
+ public static void backToAcceptedDefault(CharSequence typedWord) {
+ if (typedWord == null) return;
switch (sState) {
case STATE_SPACE_AFTER_ACCEPTED:
case STATE_PUNCTUATION_AFTER_ACCEPTED: