summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/inputmethod
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2013-08-07 15:03:24 +0000
committerKen Wakasa <kwakasa@google.com>2013-08-07 15:03:24 +0000
commitc3a1914bd777575cee1917d99d14f05bfd128717 (patch)
tree924db5a2172ca2a05076d981f1052f013aed93ab /core/java/android/view/inputmethod
parente9a6f9713ca48aab9a6c87e0645cb0a0af946a11 (diff)
downloadframeworks_base-c3a1914bd777575cee1917d99d14f05bfd128717.zip
frameworks_base-c3a1914bd777575cee1917d99d14f05bfd128717.tar.gz
frameworks_base-c3a1914bd777575cee1917d99d14f05bfd128717.tar.bz2
Revert "Reduce the transaction fee of getEnabledInputMethodSubtypeList"
This reverts commit e9a6f9713ca48aab9a6c87e0645cb0a0af946a11. Change-Id: I611d31086d4f02aae5c7021ac92975bd92a59f34
Diffstat (limited to 'core/java/android/view/inputmethod')
-rw-r--r--core/java/android/view/inputmethod/InputMethodManager.java3
1 files changed, 1 insertions, 2 deletions
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 final class InputMethodManager {
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);
}