Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix delayed hide soft input when switch user

Browse Source 
The user switch task may cost some time and delay
to send the hide soft input action. It likely happended
when system is busy(e.g. starting winscope trace).

1. Try to fix this by sending the hide soft input action
   before user switch task.
2. Remove the mSystemReady checking since user switch task
   should be always posted afterward.

Bug: 176291101
Test: atest CtsInputMethodTestCases
Change-Id: I1689e7a7a30ed717520e9d3c160e1727202ee15b
This commit is contained in:
Wilson Wu
2021-03-04 17:29:45 +08:00
parent b0ee36eda0
commit 1de53e5369
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
View File

@@ -1625,6 +1625,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
}
mHandler.removeCallbacks(mUserSwitchHandlerTask);
}
// Hide soft input before user switch task since switch task may block main handler a while
// and delayed the MSG_HIDE_SOFT_INPUT.
hideCurrentInputLocked(
mCurFocusedWindow, 0, null, SoftInputShowHideReason.HIDE_SWITCH_USER);
final UserSwitchHandlerTask task = new UserSwitchHandlerTask(this, userId,
clientToBeReset);
mUserSwitchHandlerTask = task;
@@ -1750,20 +1754,16 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
final boolean initialUserSwitch = TextUtils.isEmpty(defaultImiId);
mLastSystemLocales = mRes.getConfiguration().getLocales();
// TODO: Is it really possible that switchUserLocked() happens before system ready?
if (mSystemReady) {
hideCurrentInputLocked(
mCurFocusedWindow, 0, null, SoftInputShowHideReason.HIDE_SWITCH_USER);
resetCurrentMethodAndClient(UnbindReason.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);
// The mSystemReady flag is set during boot phase,
// and user switch would not happen at that time.
resetCurrentMethodAndClient(UnbindReason.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);
if (initialUserSwitch) {
InputMethodUtils.setNonSelectedSystemImesDisabledUntilUsed(mIPackageManager,