Merge "Declare IMM#mIInputContext with its concrete type" (0e5e76a3) · Commits · e / os / android_frameworks_base

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

+4 −7

Original line number	Original line	Diff line number	Diff line
	@@ -366,7 +366,7 @@ public final class InputMethodManager {
	final H mH;		final H mH;

	// Our generic input connection if the current target does not have its own.		// Our generic input connection if the current target does not have its own.
	final IInputContext mIInputContext;		private final IInputConnectionWrapper mIInputContext;

	private final int mDisplayId;		private final int mDisplayId;

	@@ -920,12 +920,9 @@ public final class InputMethodManager {
	// that this happened and make sure our own editor's		// that this happened and make sure our own editor's
	// state is reset.		// state is reset.
	mRestartOnNextWindowFocus = true;		mRestartOnNextWindowFocus = true;
	try {
	// Note that finishComposingText() is allowed to run		// Note that finishComposingText() is allowed to run
	// even when we are not active.		// even when we are not active.
	mIInputContext.finishComposingText();		mIInputContext.finishComposingText();
	} catch (RemoteException e) {
	}
	}		}
	// Check focus again in case that "onWindowFocus" is called before		// Check focus again in case that "onWindowFocus" is called before
	// handling this message.		// handling this message.