diff options
| author | Charles Chen <charlesccchen@google.com> | 2021-06-22 21:05:34 +0800 |
|---|---|---|
| committer | Charles Chen <charlesccchen@google.com> | 2021-06-24 20:26:19 +0800 |
| commit | cbf1be8150c96c5ad66685a9394749eee065a78f (patch) | |
| tree | 3b249b3d8ee6596e2a06090a005f06b376cb31f5 /core/java/android/inputmethodservice/InputMethodService.java | |
| parent | 76dd171d1f44d2166ae5e85416c9c9f2eac934d3 (diff) | |
Remove updateImeDisplayId
After InputMethodService migrated to WindowProviderService,
the display is initialized by getInitialDisplayId().
Therefore, we don't need updateImeDisplayId() to initialize
InputMethodService's Display anymore.
Test: atest CtsInputMethodTestCases MultiDisplaySystemDecorationTests
Bug: 149463653
Change-Id: Ia78139b5defc48c8b0354fc1e212eeb38fd71ba4
Diffstat (limited to 'core/java/android/inputmethodservice/InputMethodService.java')
| -rw-r--r-- | core/java/android/inputmethodservice/InputMethodService.java | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index 18c6256dff80..42fa9fbc7b94 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -589,7 +589,7 @@ public class InputMethodService extends AbstractInputMethodService { */ @MainThread @Override - public final void initializeInternal(@NonNull IBinder token, int displayId, + public final void initializeInternal(@NonNull IBinder token, IInputMethodPrivilegedOperations privilegedOperations, int configChanges) { if (InputMethodPrivilegedOperationsRegistry.isRegistered(token)) { Log.w(TAG, "The token has already registered, ignore this initialization."); @@ -599,7 +599,6 @@ public class InputMethodService extends AbstractInputMethodService { mConfigTracker.onInitialize(configChanges); mPrivOps.set(privilegedOperations); InputMethodPrivilegedOperationsRegistry.put(token, mPrivOps); - updateInputMethodDisplay(displayId); attachToken(token); Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER); } @@ -634,25 +633,6 @@ public class InputMethodService extends AbstractInputMethodService { mWindow.setToken(token); } - // TODO(b/149463653): remove updateInputMethodDisplay(int displayId) since we'll get the - // right display by attachToWindowToken - /** - * {@inheritDoc} - * @hide - */ - @MainThread - @Override - public void updateInputMethodDisplay(int displayId) { - if (getDisplayId() == displayId) { - return; - } - // Update display for adding IME window to the right display. - // TODO(b/111364446) Need to address context lifecycle issue if need to re-create - // for update resources & configuration correctly when show soft input - // in non-default display. - updateDisplay(displayId); - } - /** * {@inheritDoc} * |
