Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a792a6ba authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Unify user init logic in IMMS#onUnlockUser() 

With this CL

  InputMethodManagerService#onUnlockUser()

starts using a unified logic for concurrent multi-user mode instead of
relying on

  InputMethodManagerService#initializeVisibleBackgroundUserLocked().

There must be no behavior change in single-user mode.

Bug: 353751919
Test: presubmit
Flag: android.view.inputmethod.concurrent_input_methods
Change-Id: I174d264d94d8e279c9a2f16f3167794a09f2f5ea
parent f445f2e6

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

+3 −8
Original line number Diff line number Diff line
@@ -1099,14 +1099,9 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
            final InputMethodSettings newSettings = queryInputMethodServicesInternal(mContext,

                    userId, AdditionalSubtypeMapRepository.get(userId), DirectBootAwareness.AUTO);

            InputMethodSettingsRepository.put(userId, newSettings);

            if (!mConcurrentMultiUserModeEnabled) {

            // We need to rebuild IMEs.

            postInputMethodSettingUpdatedLocked(false /* resetDefaultEnabledIme */, userId);

            updateInputMethodsFromSettingsLocked(true /* enabledChanged */, userId);

            } else {

                // TODO(b/352758479): Stop relying on initializeVisibleBackgroundUserLocked()

                initializeVisibleBackgroundUserLocked(userId);

            }

        }

    }