diff options
| author | 2022-07-28 02:24:34 +0000 | |
|---|---|---|
| committer | 2022-07-28 02:24:34 +0000 | |
| commit | 677ac478cef7bb5f891eb2bc213bc9441f2371bc (patch) | |
| tree | 9baf43b5d728669f8715acf9e48e66597bf74984 | |
| parent | 30f15ae1cae47dfc71df21ab6d24bb824ece4477 (diff) | |
| parent | 1e8e36c0d8ccd82f135411f17b37559bbe56842d (diff) | |
Merge "Remove unused parameters from InputMethodSubtype#sort()"
| -rw-r--r-- | core/java/android/view/inputmethod/InputMethodSubtype.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/inputmethod/InputMethodUtils.java | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodSubtype.java b/core/java/android/view/inputmethod/InputMethodSubtype.java index 9c63d56d74da..121839bc9ea6 100644 --- a/core/java/android/view/inputmethod/InputMethodSubtype.java +++ b/core/java/android/view/inputmethod/InputMethodSubtype.java @@ -666,14 +666,12 @@ public final class InputMethodSubtype implements Parcelable { /** * Sort the list of InputMethodSubtype - * @param context Context will be used for getting localized strings from IME - * @param flags Flags for the sort order * @param imi InputMethodInfo of which subtypes are subject to be sorted * @param subtypeList List of InputMethodSubtype which will be sorted * @return Sorted list of subtypes * @hide */ - public static List<InputMethodSubtype> sort(Context context, int flags, InputMethodInfo imi, + public static List<InputMethodSubtype> sort(InputMethodInfo imi, List<InputMethodSubtype> subtypeList) { if (imi == null) return subtypeList; final HashSet<InputMethodSubtype> inputSubtypesSet = new HashSet<InputMethodSubtype>( diff --git a/services/core/java/com/android/server/inputmethod/InputMethodUtils.java b/services/core/java/com/android/server/inputmethod/InputMethodUtils.java index e37a8e031c57..5e20dfbc7144 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodUtils.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodUtils.java @@ -412,7 +412,7 @@ final class InputMethodUtils { enabledSubtypes = SubtypeUtils.getImplicitlyApplicableSubtypesLocked( context.getResources(), imi); } - return InputMethodSubtype.sort(context, 0, imi, enabledSubtypes); + return InputMethodSubtype.sort(imi, enabledSubtypes); } List<InputMethodSubtype> getEnabledInputMethodSubtypeListLocked(InputMethodInfo imi) { |