OSDN Git Service

Remove an unused param from InputMethodSettings constructor
authorYohei Yukawa <yukawa@google.com>
Fri, 25 Jan 2019 10:47:32 +0000 (02:47 -0800)
committerYohei Yukawa <yukawa@google.com>
Fri, 25 Jan 2019 10:47:32 +0000 (02:47 -0800)
"methodList" parameter in the constructor of InputMethodSettings is
not used.  This CL removes it in favor of simplicity.

This is a mechanical refactoring.  There should be no behavior change.

Bug: 123379418
Test: make -j checkbuild
Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases
Change-Id: Ifd987bf57d6ed5622e9091157b1933f6da3ff181

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
services/core/java/com/android/server/inputmethod/InputMethodUtils.java

index 3b4e4dd..4db541c 100644 (file)
@@ -1405,7 +1405,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
 
         // mSettings should be created before buildInputMethodListLocked
         mSettings = new InputMethodSettings(
-                mRes, context.getContentResolver(), mMethodMap, mMethodList, userId, !mSystemReady);
+                mRes, context.getContentResolver(), mMethodMap, userId, !mSystemReady);
 
         updateCurrentProfileIds();
         AdditionalSubtypeUtils.load(mAdditionalSubtypeMap, userId);
@@ -1694,7 +1694,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
         queryInputMethodServicesInternal(mContext, userId, additionalSubtypeMap, methodMap,
                 methodList);
         final InputMethodSettings settings = new InputMethodSettings(mContext.getResources(),
-                mContext.getContentResolver(), methodMap, methodList, userId, true);
+                mContext.getContentResolver(), methodMap, userId, true);
         return settings.getEnabledInputMethodListLocked();
     }
 
@@ -1750,7 +1750,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
             return Collections.emptyList();
         }
         final InputMethodSettings settings = new InputMethodSettings(mContext.getResources(),
-                mContext.getContentResolver(), methodMap, methodList, userId, true);
+                mContext.getContentResolver(), methodMap, userId, true);
         return settings.getEnabledInputMethodSubtypeListLocked(
                 mContext, imi, allowsImplicitlySelectedSubtypes);
     }
index 429e178..cfc85da 100644 (file)
@@ -799,8 +799,8 @@ final class InputMethodUtils {
         }
 
         InputMethodSettings(Resources res, ContentResolver resolver,
-                ArrayMap<String, InputMethodInfo> methodMap, ArrayList<InputMethodInfo> methodList,
-                @UserIdInt int userId, boolean copyOnWrite) {
+                ArrayMap<String, InputMethodInfo> methodMap, @UserIdInt int userId,
+                boolean copyOnWrite) {
             mRes = res;
             mResolver = resolver;
             mMethodMap = methodMap;