commit 7d74594123bd9ee3a09f54d509bff27af5f6cca8
author Jean Chalard <jchalard@google.com> Tue Oct 14 11:42:13 2014 +0900
committer Jean Chalard <jchalard@google.com> Tue Oct 14 11:42:43 2014 +0900
tree 8f2b3fd15f19eec74487b5d0c4330a2dcdfaab01
parent 59f5988a16bfd979f748ecd356b528f0b933a42c

Fix an NPE.

Bug: 17958289
Change-Id: I5c9ea668ff75b38c7ddebd767c36a950835c0c9f

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

diff --git a/java/src/com/android/inputmethod/latin/RichInputConnection.java b/java/src/com/android/inputmethod/latin/RichInputConnection.java
index 62a258b..a3f7bb4 100644
--- a/java/src/com/android/inputmethod/latin/RichInputConnection.java
+++ b/java/src/com/android/inputmethod/latin/RichInputConnection.java
@@ -860,9 +860,10 @@
      * than it really is.
      */
     public void tryFixLyingCursorPosition() {
+        mIC = mParent.getCurrentInputConnection();
         final CharSequence textBeforeCursor = getTextBeforeCursor(
                 Constants.EDITOR_CONTENTS_CACHE_SIZE, 0);
-        final CharSequence selectedText = mIC.getSelectedText(0 /* flags */);
+        final CharSequence selectedText = null == mIC ? null : mIC.getSelectedText(0 /* flags */);
         if (null == textBeforeCursor ||
                 (!TextUtils.isEmpty(selectedText) && mExpectedSelEnd == mExpectedSelStart)) {
             // If textBeforeCursor is null, we have no idea what kind of text field we have or if