diff options
| author |   Yohei Yukawa <yukawa@google.com> | 2014-09-30 14:55:41 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-09-30 14:55:41 +0000 |
| commit | 217b32e46f50dfc96d22ab07b7813240c7f1b9e9 (patch) | |
| tree | 7bc45bf9626f332d2144e45ae82af0a65f2523a1 /java/src/com/android/inputmethod/compat | |
| parent | e44d39effbbf5d722d54ca6b97ce61d9ed855e41 (diff) | |
| parent | 6ad437edd93382ce872c42fc8a2126e34dbf98d9 (diff) | |
| download | latinime-217b32e46f50dfc96d22ab07b7813240c7f1b9e9.tar.gz latinime-217b32e46f50dfc96d22ab07b7813240c7f1b9e9.tar.xz latinime-217b32e46f50dfc96d22ab07b7813240c7f1b9e9.zip | |
am 6ad437ed: Merge "Fix NPE due to the lack of null-check" into lmp-dev
* commit '6ad437edd93382ce872c42fc8a2126e34dbf98d9':
Fix NPE due to the lack of null-check
Diffstat (limited to 'java/src/com/android/inputmethod/compat')
| -rw-r--r-- | java/src/com/android/inputmethod/compat/CursorAnchorInfoCompatWrapper.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/compat/CursorAnchorInfoCompatWrapper.java b/java/src/com/android/inputmethod/compat/CursorAnchorInfoCompatWrapper.java index c937eeeaa..5af31795c 100644 --- a/java/src/com/android/inputmethod/compat/CursorAnchorInfoCompatWrapper.java +++ b/java/src/com/android/inputmethod/compat/CursorAnchorInfoCompatWrapper.java @@ -84,8 +84,8 @@ public final class CursorAnchorInfoCompatWrapper { } @UsedForTesting - public static boolean isAvailable() { - return sCursorAnchorInfoClass.exists(); + public boolean isAvailable() { + return sCursorAnchorInfoClass.exists() && mInstance != null; } private Object mInstance; @@ -96,7 +96,7 @@ public final class CursorAnchorInfoCompatWrapper { @UsedForTesting public static CursorAnchorInfoCompatWrapper fromObject(final Object instance) { - if (!isAvailable()) { + if (!sCursorAnchorInfoClass.exists()) { return new CursorAnchorInfoCompatWrapper(null); } return new CursorAnchorInfoCompatWrapper(instance); |