Revert "Reduce the transaction fee of getEnabledInputMethodSubtypeList"
This reverts commit e9a6f9713ca48aab9a6c87e0645cb0a0af946a11.
Change-Id: I611d31086d4f02aae5c7021ac92975bd92a59f34
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index c8ce6fa..4df4734 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -613,8 +613,7 @@
public List<InputMethodSubtype> getEnabledInputMethodSubtypeList(InputMethodInfo imi,
boolean allowsImplicitlySelectedSubtypes) {
try {
- return mService.getEnabledInputMethodSubtypeList(
- imi == null ? null : imi.getId(), allowsImplicitlySelectedSubtypes);
+ return mService.getEnabledInputMethodSubtypeList(imi, 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 0149ef9..82b2654 100644
--- a/core/java/com/android/internal/view/IInputMethodManager.aidl
+++ b/core/java/com/android/internal/view/IInputMethodManager.aidl
@@ -32,7 +32,7 @@
interface IInputMethodManager {
List<InputMethodInfo> getInputMethodList();
List<InputMethodInfo> getEnabledInputMethodList();
- List<InputMethodSubtype> getEnabledInputMethodSubtypeList(in String imiId,
+ List<InputMethodSubtype> getEnabledInputMethodSubtypeList(in InputMethodInfo imi,
boolean allowsImplicitlySelectedSubtypes);
InputMethodSubtype getLastInputMethodSubtype();
// TODO: We should change the return type from List to List<Parcelable>
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index f442f11..da584e2 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -969,25 +969,19 @@
}
/**
- * @param imiId if null, returns enabled subtypes for the current imi
+ * @param imi if null, returns enabled subtypes for the current imi
* @return enabled subtypes of the specified imi
*/
@Override
- public List<InputMethodSubtype> getEnabledInputMethodSubtypeList(String imiId,
+ public List<InputMethodSubtype> getEnabledInputMethodSubtypeList(InputMethodInfo imi,
boolean allowsImplicitlySelectedSubtypes) {
// TODO: Make this work even for non-current users?
if (!calledFromValidUser()) {
- return Collections.<InputMethodSubtype>emptyList();
+ return Collections.emptyList();
}
synchronized (mMethodMap) {
- final InputMethodInfo imi;
- if (imiId == null && mCurMethodId != null) {
+ if (imi == null && mCurMethodId != null) {
imi = mMethodMap.get(mCurMethodId);
- } else {
- imi = mMethodMap.get(imiId);
- }
- if (imi == null) {
- return Collections.<InputMethodSubtype>emptyList();
}
return mSettings.getEnabledInputMethodSubtypeListLocked(
mContext, imi, allowsImplicitlySelectedSubtypes);