diff --git a/core/java/com/android/internal/inputmethod/InputMethodDebug.java b/core/java/com/android/internal/inputmethod/InputMethodDebug.java index 97ad0840fbd5b..f6f8f62ecde8d 100644 --- a/core/java/com/android/internal/inputmethod/InputMethodDebug.java +++ b/core/java/com/android/internal/inputmethod/InputMethodDebug.java @@ -93,8 +93,6 @@ public final class InputMethodDebug { return "SWITCH_IME_FAILED"; case UnbindReason.SWITCH_USER: return "SWITCH_USER"; - case UnbindReason.ACCESSIBILITY_SERVICE_DISABLED: - return "ACCESSIBILITY_SERVICE_DISABLED"; default: return "Unknown=" + reason; } diff --git a/core/java/com/android/internal/inputmethod/UnbindReason.java b/core/java/com/android/internal/inputmethod/UnbindReason.java index 8237fd38480c8..d8e4a9dd0b81e 100644 --- a/core/java/com/android/internal/inputmethod/UnbindReason.java +++ b/core/java/com/android/internal/inputmethod/UnbindReason.java @@ -34,8 +34,7 @@ import java.lang.annotation.Retention; UnbindReason.DISCONNECT_IME, UnbindReason.NO_IME, UnbindReason.SWITCH_IME_FAILED, - UnbindReason.SWITCH_USER, - UnbindReason.ACCESSIBILITY_SERVICE_DISABLED + UnbindReason.SWITCH_USER }) public @interface UnbindReason { /** @@ -68,5 +67,4 @@ public @interface UnbindReason { * user's active IME. */ int SWITCH_USER = 6; - int ACCESSIBILITY_SERVICE_DISABLED = 7; } diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index 4a0206bb02ebd..9c89563d2c925 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -5741,11 +5741,9 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub } // A11yManagerService unbinds the disabled accessibility service. We don't need // to do it here. - @UnbindReason int unbindClientReason = - UnbindReason.ACCESSIBILITY_SERVICE_DISABLED; executeOrSendMessage(mCurClient.client, obtainMessageIIOO( MSG_UNBIND_ACCESSIBILITY_SERVICE, getSequenceNumberLocked(), - unbindClientReason, mCurClient.client, accessibilityConnectionId)); + 0 /* unused */, mCurClient.client, accessibilityConnectionId)); } // We only have sessions when we bound to an input method. Remove this session // from all clients.