summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2013-08-07 15:43:29 +0900
committerSatoshi Kataoka <satok@google.com>2013-08-08 11:32:31 +0900
commitb3c21ac7c661022534135bf688a75ec35fe3a8f2 (patch)
tree2559a8e189ee4b4c5ffa765421140659d18d6653 /core
parent26d4adf30f3a40a7f3f7945939f5534a93a27c44 (diff)
downloadframeworks_base-b3c21ac7c661022534135bf688a75ec35fe3a8f2.zip
frameworks_base-b3c21ac7c661022534135bf688a75ec35fe3a8f2.tar.gz
frameworks_base-b3c21ac7c661022534135bf688a75ec35fe3a8f2.tar.bz2
Reduce the transaction fee of getEnabledInputMethodSubtypeList
Bug: 8467480 Change-Id: If18cce8fbe567df51f29adcdcedff3f743460b8b
Diffstat (limited to 'core')
-rw-r--r--core/java/android/view/inputmethod/InputMethodManager.java3
-rw-r--r--core/java/com/android/internal/view/IInputMethodManager.aidl4
2 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index 4df4734..c8ce6fa 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -613,7 +613,8 @@ public final class InputMethodManager {
public List<InputMethodSubtype> getEnabledInputMethodSubtypeList(InputMethodInfo imi,
boolean allowsImplicitlySelectedSubtypes) {
try {
- return mService.getEnabledInputMethodSubtypeList(imi, allowsImplicitlySelectedSubtypes);
+ return mService.getEnabledInputMethodSubtypeList(
+ imi == null ? null : imi.getId(), allowsImplicitlySelectedSubtypes);
} catch (RemoteException e) {
throw new RuntimeException(e);
}
diff --git a/core/java/com/android/internal/view/IInputMethodManager.aidl b/core/java/com/android/internal/view/IInputMethodManager.aidl
index 82b2654..ebd3e1c 100644
--- a/core/java/com/android/internal/view/IInputMethodManager.aidl
+++ b/core/java/com/android/internal/view/IInputMethodManager.aidl
@@ -28,11 +28,13 @@ import com.android.internal.view.IInputMethodClient;
/**
* Public interface to the global input method manager, used by all client
* applications.
+ * You need to update BridgeIInputMethodManager.java as well when changing
+ * this file.
*/
interface IInputMethodManager {
List<InputMethodInfo> getInputMethodList();
List<InputMethodInfo> getEnabledInputMethodList();
- List<InputMethodSubtype> getEnabledInputMethodSubtypeList(in InputMethodInfo imi,
+ List<InputMethodSubtype> getEnabledInputMethodSubtypeList(in String imiId,
boolean allowsImplicitlySelectedSubtypes);
InputMethodSubtype getLastInputMethodSubtype();
// TODO: We should change the return type from List to List<Parcelable>