diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-10-20 07:08:03 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-10-20 07:08:03 -0700 |
| commit | f8bd4c5c9d7de3fe3ce47342687b673f68f740a3 (patch) | |
| tree | 0d218de8fcad20e06143e6acb478ab6e996fd6ec /java/src | |
| parent | f08c697313cb8e4b998d7638ae39d02149af468f (diff) | |
| parent | 49426a1ea941c0331a6e573e36cff3c3a8e8849c (diff) | |
| download | latinime-f8bd4c5c9d7de3fe3ce47342687b673f68f740a3.tar.gz latinime-f8bd4c5c9d7de3fe3ce47342687b673f68f740a3.tar.xz latinime-f8bd4c5c9d7de3fe3ce47342687b673f68f740a3.zip | |
am 49426a1e: Fix potential NPE
* commit '49426a1ea941c0331a6e573e36cff3c3a8e8849c':
Fix potential NPE
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index d12708db9..24d599eb6 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1814,8 +1814,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar final int rawPrimaryCode = suggestion.charAt(0); // Maybe apply the "bidi mirrored" conversions for parentheses final LatinKeyboard keyboard = mKeyboardSwitcher.getLatinKeyboard(); - final int primaryCode = Key.getRtlParenthesisCode( - rawPrimaryCode, keyboard.mIsRtlKeyboard); + final boolean isRtl = keyboard != null && keyboard.mIsRtlKeyboard; + final int primaryCode = Key.getRtlParenthesisCode(rawPrimaryCode, isRtl); final CharSequence beforeText = ic != null ? ic.getTextBeforeCursor(1, 0) : ""; final int toLeft = (ic == null || TextUtils.isEmpty(beforeText)) |