Merge "Fix NPE due to the lack of null-check" into lmp-dev (6ad437ed) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/compat/CursorAnchorInfoCompatWrapper.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}