diff options
4 files changed, 6 insertions, 24 deletions
diff --git a/services/core/java/com/android/server/inputmethod/HardwareKeyboardShortcutController.java b/services/core/java/com/android/server/inputmethod/HardwareKeyboardShortcutController.java index a6b07dedfa4a..41313fa1fb2c 100644 --- a/services/core/java/com/android/server/inputmethod/HardwareKeyboardShortcutController.java +++ b/services/core/java/com/android/server/inputmethod/HardwareKeyboardShortcutController.java @@ -33,8 +33,7 @@ final class HardwareKeyboardShortcutController { @GuardedBy("ImfLock.class") private final ArrayList<InputMethodSubtypeHandle> mSubtypeHandles = new ArrayList<>(); - HardwareKeyboardShortcutController(@NonNull InputMethodSettings settings) { - update(settings); + HardwareKeyboardShortcutController() { } @GuardedBy("ImfLock.class") diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index 0e628b72cb39..5285dca83eaf 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -1293,6 +1293,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. final var userData = getUserData(mCurrentUserId); userData.mSwitchingController.resetCircularListLocked(settings); userData.mHardwareKeyboardShortcutController.update(settings); + mMenuController = new InputMethodMenuController(this); mVisibilityStateComputer = new ImeVisibilityStateComputer(this); mVisibilityApplier = new DefaultImeVisibilityApplier(this); diff --git a/services/core/java/com/android/server/inputmethod/InputMethodSubtypeSwitchingController.java b/services/core/java/com/android/server/inputmethod/InputMethodSubtypeSwitchingController.java index f97a5165ebec..0203ab05535c 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodSubtypeSwitchingController.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodSubtypeSwitchingController.java @@ -16,10 +16,8 @@ package com.android.server.inputmethod; -import android.annotation.AnyThread; import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.UserIdInt; import android.content.Context; import android.os.UserHandle; import android.text.TextUtils; @@ -480,25 +478,12 @@ final class InputMethodSubtypeSwitchingController { @NonNull private final Context mContext; - @UserIdInt - private final int mUserId; @NonNull private ControllerImpl mController; - InputMethodSubtypeSwitchingController(@NonNull Context context, - @NonNull InputMethodSettings settings) { + InputMethodSubtypeSwitchingController(@NonNull Context context) { mContext = context; - mUserId = settings.getUserId(); - mController = ControllerImpl.createFrom(null, - getSortedInputMethodAndSubtypeList( - false /* includeAuxiliarySubtypes */, false /* isScreenLocked */, - false /* forImeMenu */, context, settings)); - } - - @AnyThread - @UserIdInt - int getUserId() { - return mUserId; + mController = ControllerImpl.createFrom(null, Collections.emptyList()); } public void onUserActionLocked(@NonNull InputMethodInfo imi, diff --git a/services/core/java/com/android/server/inputmethod/UserDataRepository.java b/services/core/java/com/android/server/inputmethod/UserDataRepository.java index 1f089bf30b42..423226af3cb4 100644 --- a/services/core/java/com/android/server/inputmethod/UserDataRepository.java +++ b/services/core/java/com/android/server/inputmethod/UserDataRepository.java @@ -108,11 +108,8 @@ final class UserDataRepository { @NonNull InputMethodBindingController bindingController, @NonNull Context context) { mUserId = userId; mBindingController = bindingController; - final var emptySettings = InputMethodSettings.createEmptyMap(userId); - mSwitchingController = new InputMethodSubtypeSwitchingController(context, - emptySettings); - mHardwareKeyboardShortcutController = new HardwareKeyboardShortcutController( - emptySettings); + mSwitchingController = new InputMethodSubtypeSwitchingController(context); + mHardwareKeyboardShortcutController = new HardwareKeyboardShortcutController(); } @Override |