nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 9959140f: Merge "Fix an NPE." 

* commit '9959140f15edcb32c21406e3cff80ad6856e83c9':
  Fix an NPE.
main
Jean Chalard 2014-10-14 02:57:23 +00:00 committed by Android Git Automerger
parent 390fe20fde 9959140f15
commit 5f8823c1ce
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/src/com/android/inputmethod/latin/RichInputConnection.java
View File

@ -860,9 +860,10 @@ public final class RichInputConnection implements PrivateCommandPerformer {
* than it really is. * than it really is.
*/ */
public void tryFixLyingCursorPosition() { public void tryFixLyingCursorPosition() {
mIC = mParent.getCurrentInputConnection();
final CharSequence textBeforeCursor = getTextBeforeCursor( final CharSequence textBeforeCursor = getTextBeforeCursor(
Constants.EDITOR_CONTENTS_CACHE_SIZE, 0); 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 || if (null == textBeforeCursor ||
(!TextUtils.isEmpty(selectedText) && mExpectedSelEnd == mExpectedSelStart)) { (!TextUtils.isEmpty(selectedText) && mExpectedSelEnd == mExpectedSelStart)) {
// If textBeforeCursor is null, we have no idea what kind of text field we have or if // If textBeforeCursor is null, we have no idea what kind of text field we have or if