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

am 31838876: am 9baaa4b5: am 6ad437ed: Merge "Fix NPE due to the lack of null-check" into lmp-dev 

* commit '318388767d7f6d651f05f4ab9022233c0543b259':
  Fix NPE due to the lack of null-check
main
Yohei Yukawa 2014-10-01 01:55:42 +00:00 committed by Android Git Automerger
parent 304bca8172 318388767d
commit 702a736ede
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
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);

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

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