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

Merge "Fix session race due to pending user-switch task" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-05 23:06:38 +00:00
committed by Android (Google) Code Review
parent ec6198e99d 32807ad564
commit 243ac3d355
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2480,6 +2480,11 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
void onSessionCreated(IInputMethod method, IInputMethodSession session, void onSessionCreated(IInputMethod method, IInputMethodSession session,
InputChannel channel) { InputChannel channel) {
synchronized (mMethodMap) { synchronized (mMethodMap) {
if (mUserSwitchHandlerTask != null) {
// We have a pending user-switching task so it's better to just ignore this session.
channel.dispose();
return;
}
if (mCurMethod != null && method != null if (mCurMethod != null && method != null
&& mCurMethod.asBinder() == method.asBinder()) { && mCurMethod.asBinder() == method.asBinder()) {
if (mCurClient != null) { if (mCurClient != null) {