commit 49426a1ea941c0331a6e573e36cff3c3a8e8849c
author Tadashi G. Takaoka <takaoka@google.com> Thu Oct 20 20:31:17 2011 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Thu Oct 20 20:31:17 2011 +0900
tree 0d218de8fcad20e06143e6acb478ab6e996fd6ec
parent 9f058749f2e8bf9194034d273535c960fe811161

Fix potential NPE

Bug: 5462524
Change-Id: I76012d1bbcd83d58f034c2f588802e4d1b7edc4d

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index d12708d..24d599e 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1814,8 +1814,8 @@
             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))