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

Merge "Fix NPE due to the lack of null-check" into lmp-dev

Browse source
This commit is contained in:
Yohei Yukawa 2014-09-30 00:41:23 +00:00 committed by Android (Google) Code Review
commit 6ad437edd9
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
java/src/com/android/inputmethod/compat/CursorAnchorInfoCompatWrapper.java
View file

@ -84,8 +84,8 @@ public final class CursorAnchorInfoCompatWrapper {
} }
@UsedForTesting @UsedForTesting
public static boolean isAvailable() { public boolean isAvailable() {
return sCursorAnchorInfoClass.exists(); return sCursorAnchorInfoClass.exists() && mInstance != null;
} }
private Object mInstance; private Object mInstance;
@ -96,7 +96,7 @@ public final class CursorAnchorInfoCompatWrapper {
@UsedForTesting @UsedForTesting
public static CursorAnchorInfoCompatWrapper fromObject(final Object instance) { public static CursorAnchorInfoCompatWrapper fromObject(final Object instance) {
if (!isAvailable()) { if (!sCursorAnchorInfoClass.exists()) {
return new CursorAnchorInfoCompatWrapper(null); return new CursorAnchorInfoCompatWrapper(null);
} }
return new CursorAnchorInfoCompatWrapper(instance); return new CursorAnchorInfoCompatWrapper(instance);

2
java/src/com/android/inputmethod/keyboard/TextDecorator.java
View file

@ -182,7 +182,7 @@ public class TextDecorator {
private void layoutMain() { private void layoutMain() {
final CursorAnchorInfoCompatWrapper info = mCursorAnchorInfoWrapper; final CursorAnchorInfoCompatWrapper info = mCursorAnchorInfoWrapper;
if (info == null) { if (info == null || !info.isAvailable()) {
cancelLayoutInternalExpectedly("CursorAnchorInfo isn't available."); cancelLayoutInternalExpectedly("CursorAnchorInfo isn't available.");
return; return;
} }