From 1e8e36c0d8ccd82f135411f17b37559bbe56842d Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Thu, 28 Jul 2022 09:04:12 +0900 Subject: [PATCH] Remove unused parameters from InputMethodSubtype#sort() This CL removes two unused parameters from InputMethodService#sort(), which have never been used since they were initially added [1]. [1]: I94ad55b8eab49dc9b233dcb4e74429863b406fb4 7265d9bd6d80c5bedaa6de2b80f6619a301a07c8 Bug: 234882948 Test: presubmit Change-Id: I20c9aae92b5c8e455b4c15c6bcec7247738dd88d --- core/java/android/view/inputmethod/InputMethodSubtype.java | 4 +--- .../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 9c63d56d74da6..121839bc9ea64 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 sort(Context context, int flags, InputMethodInfo imi, + public static List sort(InputMethodInfo imi, List subtypeList) { if (imi == null) return subtypeList; final HashSet inputSubtypesSet = new HashSet( diff --git a/services/core/java/com/android/server/inputmethod/InputMethodUtils.java b/services/core/java/com/android/server/inputmethod/InputMethodUtils.java index e37a8e031c57a..5e20dfbc71444 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 getEnabledInputMethodSubtypeListLocked(InputMethodInfo imi) {