Remove parameter from current input binding
Bug: 205676419
Test: make
Change-Id: I331567a5072916d477af6a9ccad99a3a9d7d6cc1
diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index ad78ccd..b64904d 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -1985,8 +1985,8 @@
}
@GuardedBy("mMethodMap")
- private boolean bindCurrentInputMethodServiceLocked(
- Intent service, ServiceConnection conn, int flags) {
+ private boolean bindCurrentInputMethodServiceLocked(ServiceConnection conn, int flags) {
+ Intent service = getCurIntent();
if (service == null || conn == null) {
Slog.e(TAG, "--- bind failed: service = " + service + ", conn = " + conn);
return false;
@@ -3211,8 +3211,7 @@
showInputToken));
mInputShown = true;
if (hasConnection() && !isVisibleBound()) {
- bindCurrentInputMethodServiceLocked(
- getCurIntent(), getVisibleConnection(), IME_VISIBLE_BIND_FLAGS);
+ bindCurrentInputMethodServiceLocked(getVisibleConnection(), IME_VISIBLE_BIND_FLAGS);
setVisibleBound(true);
}
res = true;
@@ -3228,7 +3227,7 @@
Slog.w(TAG, "Force disconnect/connect to the IME in showCurrentInputLocked()");
ServiceConnection connection = getMainConnection();
mContext.unbindService(connection);
- bindCurrentInputMethodServiceLocked(getCurIntent(), connection,
+ bindCurrentInputMethodServiceLocked(connection,
mImeConnectionBindFlags);
} else {
if (DEBUG) {
