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

Merge "Fix InputMethodServiceInternal lifetime"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-10-01 09:39:55 +00:00
committed by Android (Google) Code Review
parent 01c65d86c2 1ab4cb2da6
commit ceed9751d3
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/inputmethodservice/AbstractInputMethodService.java
View File

@@ -66,7 +66,17 @@ import java.io.PrintWriter;
public abstract class AbstractInputMethodService extends WindowProviderService
implements KeyEvent.Callback {
private InputMethod mInputMethod;
/**
* Keep the strong reference to {@link InputMethodServiceInternal} to ensure that it will not be
* garbage-collected until {@link AbstractInputMethodService} gets garbage-collected.
*
* <p>This is necessary because {@link RemoteInputConnection} internally uses
* {@link java.lang.ref.WeakReference} to hold {@link InputMethodServiceInternal}.</p>
*/
@Nullable
private InputMethodServiceInternal mInputMethodServiceInternal;
final KeyEvent.DispatcherState mDispatcherState
= new KeyEvent.DispatcherState();
@@ -225,7 +235,10 @@ public abstract class AbstractInputMethodService extends WindowProviderService
if (mInputMethod == null) {
mInputMethod = onCreateInputMethodInterface();
}
return new IInputMethodWrapper(createInputMethodServiceInternal(), mInputMethod);
if (mInputMethodServiceInternal == null) {
mInputMethodServiceInternal = createInputMethodServiceInternal();
}
return new IInputMethodWrapper(mInputMethodServiceInternal, mInputMethod);
}
/**