From e0af39403ed67d26b918da32c9da05d0371835ea Mon Sep 17 00:00:00 2001 From: lumark Date: Wed, 29 May 2019 17:11:57 +0800 Subject: Skip IME initialization when received the token that already registered When IME window switches from current display to another display and back quickly, system will re-bind InputMethodService to re-attach window token for each moving, the IME service lifecycle will be onBind -> onUnBind -> onDestroy -> onBind. Ideally, system will deliver window token when onServiceConnected and system should only receive one onServiceConnected when the last service bound. But due to user switch display very quick, before unbind service callbacked from client, the next bind service request comes, caused the connection exists in system side and client will then callback 2 onServiceConnected to system. Since CL [1] introduced InputMethodPrivilegedOperationsRegistry to deal with token registraction singleton-ness, the exception will be thrown for above case due to the duplicate window token passed to client. Add InputMethodPrivilegedOperationsRegistry#isRegistered to check if the token already registered, if so, skip this duplicate initialization request. [1]: I4a61470f06ffac5f7a512536f8431489db0108f4 Fix: 133624278 Test: manual as below steps: 1) Settings > Developer options, enable "Simulated display" & "force desktop mode" 2) Reboot device. 3) Launch app from simulated display. 4) Launch app from primary display (i.e. contacts), focus EditText to show IME. 5) Tapping primary & simulated display repeatly & quickly. 6) See if any exception log from IME application. (i.e. Gboard) Change-Id: Ie6bfbae735724fe744590e715124d2737d2b665d --- core/java/android/inputmethodservice/InputMethodService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'core/java/android/inputmethodservice/InputMethodService.java') diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index ab630fd7467b..82d4d1d10d7e 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -472,8 +472,12 @@ public class InputMethodService extends AbstractInputMethodService { */ @MainThread @Override - public final void initializeInternal(IBinder token, int displayId, + public final void initializeInternal(@NonNull IBinder token, int displayId, IInputMethodPrivilegedOperations privilegedOperations) { + if (InputMethodPrivilegedOperationsRegistry.isRegistered(token)) { + Log.w(TAG, "The token has already registered, ignore this initialization."); + return; + } mPrivOps.set(privilegedOperations); InputMethodPrivilegedOperationsRegistry.put(token, mPrivOps); updateInputMethodDisplay(displayId); -- cgit v1.2.3