Merge "Make sure to call back View#onCheckIsTextEditor() on the UI thread" (ec2ba88f) · Commits · e / os / android_frameworks_base

core/java/android/view/inputmethod/InputMethodManager.java

+11 −11

Original line number	Diff line number	Diff line
		@@ -2657,17 +2657,6 @@ public final class InputMethodManager {
		}
		}

		if (windowGainingFocus == null) {
		windowGainingFocus = view.getWindowToken();
		if (windowGainingFocus == null) {
		Log.e(TAG, "ABORT input: ServedView must be attached to a Window");
		return false;
		}
		startInputFlags = getStartInputFlags(view, startInputFlags);
		softInputMode = view.getViewRootImpl().mWindowAttributes.softInputMode;
		windowFlags = view.getViewRootImpl().mWindowAttributes.flags;
		}

		// Now we need to get an input connection from the served view.
		// This is complicated in a couple ways: we can't be holding our lock
		// when calling out to the view, and we need to make sure we call into
		@@ -2690,6 +2679,17 @@ public final class InputMethodManager {
		return false;
		}

		if (windowGainingFocus == null) {
		windowGainingFocus = view.getWindowToken();
		if (windowGainingFocus == null) {
		Log.e(TAG, "ABORT input: ServedView must be attached to a Window");
		return false;
		}
		startInputFlags = getStartInputFlags(view, startInputFlags);
		softInputMode = view.getViewRootImpl().mWindowAttributes.softInputMode;
		windowFlags = view.getViewRootImpl().mWindowAttributes.flags;
		}

		// Okay we are now ready to call into the served view and have it
		// do its stuff.
		// Life is good: let's hook everything up!