summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yohei Yukawa <yukawa@google.com> 2018-10-22 15:05:47 -0700
committer Yohei Yukawa <yukawa@google.com> 2018-10-22 15:05:47 -0700
commit530dd76fde8fc66d61a8eb17c924d51ee64c0405 (patch)
treeae165315c448b96266458c7077ea4a98b61ecb90
parentf7517f153dbe9095fc597d165e32f86fe9c7a14b (diff)
Remove IInputMethodSession#finishInput(), which is called nowhere
Currently IInputMethodSession#finishInput() is called nowhere. Let's remove this IPC method exposed from InputMethodService to IME client for now until we fully understand what is the right approach on how and when InputMethodService#finishInput() should be called. Note that we cannot simply remove InputMethodSession#finishInput() because it is already published as a public API. In Bug 9216494 hopefully we can also discuss whether InputMethodSession#finishInput() should be deprecated or can be reused for some actual use cases. Bug: 9216494 Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases Change-Id: I9e378111c9df40cb6821583d1e6ae8f9fe38f2b1
-rw-r--r--core/java/android/inputmethodservice/IInputMethodSessionWrapper.java11
-rw-r--r--core/java/com/android/internal/view/IInputMethodSession.aidl4
2 files changed, 2 insertions, 13 deletions
diff --git a/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java b/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
index 0982d65ee4c9..843db6d28d30 100644
--- a/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
+++ b/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
@@ -41,8 +41,7 @@ import com.android.internal.view.IInputMethodSession;
class IInputMethodSessionWrapper extends IInputMethodSession.Stub
implements HandlerCaller.Callback {
private static final String TAG = "InputMethodWrapper";
-
- private static final int DO_FINISH_INPUT = 60;
+
private static final int DO_DISPLAY_COMPLETIONS = 65;
private static final int DO_UPDATE_EXTRACTED_TEXT = 67;
private static final int DO_UPDATE_SELECTION = 90;
@@ -89,9 +88,6 @@ class IInputMethodSessionWrapper extends IInputMethodSession.Stub
}
switch (msg.what) {
- case DO_FINISH_INPUT:
- mInputMethodSession.finishInput();
- return;
case DO_DISPLAY_COMPLETIONS:
mInputMethodSession.displayCompletions((CompletionInfo[])msg.obj);
return;
@@ -150,11 +146,6 @@ class IInputMethodSessionWrapper extends IInputMethodSession.Stub
}
@Override
- public void finishInput() {
- mCaller.executeOrSendMessage(mCaller.obtainMessage(DO_FINISH_INPUT));
- }
-
- @Override
public void displayCompletions(CompletionInfo[] completions) {
mCaller.executeOrSendMessage(mCaller.obtainMessageO(
DO_DISPLAY_COMPLETIONS, completions));
diff --git a/core/java/com/android/internal/view/IInputMethodSession.aidl b/core/java/com/android/internal/view/IInputMethodSession.aidl
index 367b713ed78f..794238a3826e 100644
--- a/core/java/com/android/internal/view/IInputMethodSession.aidl
+++ b/core/java/com/android/internal/view/IInputMethodSession.aidl
@@ -29,10 +29,8 @@ import android.view.inputmethod.ExtractedText;
* {@hide}
*/
oneway interface IInputMethodSession {
- void finishInput();
-
void updateExtractedText(int token, in ExtractedText text);
-
+
void updateSelection(int oldSelStart, int oldSelEnd,
int newSelStart, int newSelEnd,
int candidatesStart, int candidatesEnd);