diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java | 6 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 13 |
2 files changed, 18 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java index 4b77473d9..0a09c845e 100644 --- a/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java @@ -149,7 +149,11 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary { final Cursor cursor = mContext.getContentResolver().query( Contacts.CONTENT_URI, PROJECTION_ID_ONLY, null, null, null); if (cursor != null) { - return cursor.getCount(); + try { + return cursor.getCount(); + } finally { + cursor.close(); + } } return 0; } diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index b474a8558..139eb46ca 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -2291,6 +2291,19 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen break; } } + + if (Keyboard.CODE_DELETE == primaryCode) { + // This is a stopgap solution to avoid leaving a high surrogate alone in a text view. + // In the future, we need to deprecate deteleSurroundingText() and have a surrogate + // pair-friendly way of deleting characters in InputConnection. + final InputConnection ic = getCurrentInputConnection(); + if (null != ic) { + final CharSequence lastChar = ic.getTextBeforeCursor(1, 0); + if (lastChar.length() > 0 && Character.isHighSurrogate(lastChar.charAt(0))) { + ic.deleteSurroundingText(1, 0); + } + } + } } // receive ringer mode change and network state change. |