Inline IMMS#resetAllInternalStateLocked()
Currently IMMS#resetAllInternalStateLocked(boolean, boolean) has
only two call sites, and the first parameter is the constant for
each call site. We can get much simpler code by inlining the
method in question into those two call sites. It actually revealed
that UNBIND_REASON_RESET_IME should have been called
UNBIND_REASON_SWITCH_USER.
Test: no behavior change
Test: adb shell dumpsys input_method | grep "mMethodMapUpdateCount="
to make sure that switching users can cause the same count
increase.
Test: adb shell dumpsys input_method | grep "mMethodMapUpdateCount="
to make sure that switching the device locale can cause the
same count increase.
Bug: 35079353
Change-Id: I63388402369f58d11fdb21b508eb2051ff39fa5b
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java
index 121bc3c..2b3d8d4 100644
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -600,15 +600,35 @@
restoreEnabledInputMethods(mContext, prevValue, newValue);
}
} else if (Intent.ACTION_LOCALE_CHANGED.equals(action)) {
- synchronized (mMethodMap) {
- resetStateIfCurrentLocaleChangedLocked();
- }
+ onActionLocaleChanged();
} else {
Slog.w(TAG, "Unexpected intent " + intent);
}
}
}
+ /**
+ * Handles {@link Intent#ACTION_LOCALE_CHANGED}.
+ *
+ * <p>Note: For historical reasons, {@link Intent#ACTION_LOCALE_CHANGED} has been sent to all
+ * the users. We should ignore this event if this is about any background user's locale.</p>
+ *
+ * <p>Caution: This method must not be called when system is not ready.</p>
+ */
+ void onActionLocaleChanged() {
+ synchronized (mMethodMap) {
+ final LocaleList possibleNewLocale = mRes.getConfiguration().getLocales();
+ if (possibleNewLocale != null && possibleNewLocale.equals(mLastSystemLocales)) {
+ return;
+ }
+ buildInputMethodListLocked(true);
+ // If the locale is changed, needs to reset the default ime
+ resetDefaultImeLocked(mContext);
+ updateFromSettingsLocked(true);
+ mLastSystemLocales = possibleNewLocale;
+ }
+ }
+
// Apply the results of a restore operation to the set of enabled IMEs. Note that this
// does not attempt to validate on the fly with any installed device policy, so must only
// be run in the context of initial device setup.
@@ -980,51 +1000,6 @@
setSelectedInputMethodAndSubtypeLocked(defIm, NOT_A_SUBTYPE_ID, false);
}
- private void resetAllInternalStateLocked(final boolean updateOnlyWhenLocaleChanged,
- final boolean resetDefaultEnabledIme) {
- if (!mSystemReady) {
- // not system ready
- return;
- }
- final LocaleList newLocales = mRes.getConfiguration().getLocales();
- if (!updateOnlyWhenLocaleChanged
- || (newLocales != null && !newLocales.equals(mLastSystemLocales))) {
- if (!updateOnlyWhenLocaleChanged) {
- hideCurrentInputLocked(0, null);
- resetCurrentMethodAndClient(InputMethodClient.UNBIND_REASON_RESET_IME);
- }
- if (DEBUG) {
- Slog.i(TAG, "LocaleList has been changed to " + newLocales);
- }
- buildInputMethodListLocked(resetDefaultEnabledIme);
- if (!updateOnlyWhenLocaleChanged) {
- final String selectedImiId = mSettings.getSelectedInputMethod();
- if (TextUtils.isEmpty(selectedImiId)) {
- // This is the first time of the user switch and
- // set the current ime to the proper one.
- resetDefaultImeLocked(mContext);
- }
- } else {
- // If the locale is changed, needs to reset the default ime
- resetDefaultImeLocked(mContext);
- }
- updateFromSettingsLocked(true);
- mLastSystemLocales = newLocales;
- if (!updateOnlyWhenLocaleChanged) {
- try {
- startInputInnerLocked();
- } catch (RuntimeException e) {
- Slog.w(TAG, "Unexpected exception", e);
- }
- }
- }
- }
-
- private void resetStateIfCurrentLocaleChangedLocked() {
- resetAllInternalStateLocked(true /* updateOnlyWhenLocaleChanged */,
- true /* resetDefaultImeLocked */);
- }
-
private void switchUserLocked(int newUserId) {
if (DEBUG) Slog.d(TAG, "Switching user stage 1/3. newUserId=" + newUserId
+ " currentUserId=" + mSettings.getCurrentUserId());
@@ -1051,8 +1026,26 @@
// Even in such cases, IMMS works fine because it will find the most applicable
// IME for that user.
final boolean initialUserSwitch = TextUtils.isEmpty(defaultImiId);
- resetAllInternalStateLocked(false /* updateOnlyWhenLocaleChanged */,
- initialUserSwitch /* needsToResetDefaultIme */);
+ mLastSystemLocales = mRes.getConfiguration().getLocales();
+
+ // TODO: Is it really possible that switchUserLocked() happens before system ready?
+ if (mSystemReady) {
+ hideCurrentInputLocked(0, null);
+ resetCurrentMethodAndClient(InputMethodClient.UNBIND_REASON_SWITCH_USER);
+ buildInputMethodListLocked(initialUserSwitch);
+ if (TextUtils.isEmpty(mSettings.getSelectedInputMethod())) {
+ // This is the first time of the user switch and
+ // set the current ime to the proper one.
+ resetDefaultImeLocked(mContext);
+ }
+ updateFromSettingsLocked(true);
+ try {
+ startInputInnerLocked();
+ } catch (RuntimeException e) {
+ Slog.w(TAG, "Unexpected exception", e);
+ }
+ }
+
if (initialUserSwitch) {
InputMethodUtils.setNonSelectedSystemImesDisabledUntilUsed(mIPackageManager,
mSettings.getEnabledInputMethodListLocked(), newUserId,