From e48d0ae6612d507180956a1ee17b250cc68c7735 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Wed, 17 Oct 2018 16:14:34 +0800 Subject: [PATCH] Remove IInputMethodManager#finishInput(), which is NOP Currently InputMethodManagerService#finishInput() does nothing. Until we fully understand what is the right approach on how and when InputMethodService#finishInput() (Bug 9216494), let's remove this unnecessary IPC from the IME client to InputMethodManagerService. Bug: 9216494 Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases Test: atest FrameworksCoreTests:android.view.inputmethod.InputMethodManagerTest Change-Id: I614050d20f4a7d9611dc0502e55e6ca3458a836e --- core/java/android/view/inputmethod/InputMethodManager.java | 7 ------- core/java/com/android/internal/view/IInputMethodManager.aidl | 1 - .../com/android/server/inputmethod/InputMethodManagerService.java | 4 ---- 3 files changed, 12 deletions(-) diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index e8e4b4aba0d4..a401c6def23a 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -1052,13 +1052,6 @@ public final class InputMethodManager { mNextServedView = null; if (mServedView != null) { if (DEBUG) Log.v(TAG, "FINISH INPUT: mServedView=" + dumpViewInfo(mServedView)); - if (mCurrentTextBoxAttribute != null) { - try { - mService.finishInput(mClient); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } mServedView = null; mCompletions = null; mServedConnecting = false; diff --git a/core/java/com/android/internal/view/IInputMethodManager.aidl b/core/java/com/android/internal/view/IInputMethodManager.aidl index dceacda5d4a3..34e850130b50 100644 --- a/core/java/com/android/internal/view/IInputMethodManager.aidl +++ b/core/java/com/android/internal/view/IInputMethodManager.aidl @@ -46,7 +46,6 @@ interface IInputMethodManager { // Currently there is a bug that aidl doesn't accept List List getShortcutInputMethodsAndSubtypes(); - void finishInput(in IInputMethodClient client); boolean showSoftInput(in IInputMethodClient client, int flags, in ResultReceiver resultReceiver); boolean hideSoftInput(in IInputMethodClient client, int flags, diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index 862ea9d590c4..fc76b46f5dcf 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -2015,10 +2015,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } @Override - public void finishInput(IInputMethodClient client) { - } - - @Override public void onServiceConnected(ComponentName name, IBinder service) { synchronized (mMethodMap) { if (mCurIntent != null && name.equals(mCurIntent.getComponent())) { -- 2.11.0