Merge "Rename InputMethodSessionWrapper to IInputMethodSessionInvoker" (2f2fa38f) · Commits · e / os / android_frameworks_base

core/java/android/view/inputmethod/InputMethodSessionWrapper.java→core/java/android/view/inputmethod/IInputMethodSessionInvoker.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ import com.android.internal.inputmethod.IRemoteInputConnection;
		* Using current {@link IInputMethodSession} object to communicate with
		* {@link android.inputmethodservice.InputMethodService}.
		*/
		final class InputMethodSessionWrapper {
		final class IInputMethodSessionInvoker {

		private static final String TAG = "InputMethodSessionWrapper";

		@@ -42,21 +42,21 @@ final class InputMethodSessionWrapper {
		@NonNull
		private final IInputMethodSession mSession;

		private InputMethodSessionWrapper(@NonNull IInputMethodSession inputMethodSession) {
		private IInputMethodSessionInvoker(@NonNull IInputMethodSession inputMethodSession) {
		mSession = inputMethodSession;
		}

		/**
		* Create a {@link InputMethodSessionWrapper} instance if applicability.
		* Create a {@link IInputMethodSessionInvoker} instance if applicability.
		*
		* @param inputMethodSession {@link IInputMethodSession} object to be wrapped.
		* @return an instance of {@link InputMethodSessionWrapper} if {@code inputMethodSession} is not
		* {@code null}. {@code null} otherwise.
		* @return an instance of {@link IInputMethodSessionInvoker} if {@code inputMethodSession} is
		* not {@code null}. {@code null} otherwise.
		*/
		@Nullable
		public static InputMethodSessionWrapper createOrNull(
		public static IInputMethodSessionInvoker createOrNull(
		@NonNull IInputMethodSession inputMethodSession) {
		return inputMethodSession != null ? new InputMethodSessionWrapper(inputMethodSession)
		return inputMethodSession != null ? new IInputMethodSessionInvoker(inputMethodSession)
		: null;
		}

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -525,7 +525,7 @@ public final class InputMethodManager {
		*/
		@Nullable
		@GuardedBy("mH")
		private InputMethodSessionWrapper mCurrentInputMethodSession = null;
		private IInputMethodSessionInvoker mCurrentInputMethodSession = null;
		/**
		* Encapsulates IPCs to the currently connected AccessibilityServices.
		*/
		@@ -932,7 +932,7 @@ public final class InputMethodManager {
		setInputChannelLocked(res.channel);
		mCurMethod = res.method; // for @UnsupportedAppUsage
		mCurrentInputMethodSession =
		InputMethodSessionWrapper.createOrNull(res.method);
		IInputMethodSessionInvoker.createOrNull(res.method);
		mCurId = res.id;
		mBindSequence = res.sequence;
		mVirtualDisplayToScreenMatrix = res.getVirtualDisplayToScreenMatrix();
		@@ -2419,7 +2419,7 @@ public final class InputMethodManager {
		setInputChannelLocked(res.channel);
		mBindSequence = res.sequence;
		mCurMethod = res.method; // for @UnsupportedAppUsage
		mCurrentInputMethodSession = InputMethodSessionWrapper.createOrNull(res.method);
		mCurrentInputMethodSession = IInputMethodSessionInvoker.createOrNull(res.method);
		mAccessibilityInputMethodSession.clear();
		if (res.accessibilitySessions != null) {
		for (int i = 0; i < res.accessibilitySessions.size(); i++) {