From cc4c229ec42f247753f502e626b766b29517c18b Mon Sep 17 00:00:00 2001
From: Yohei Yukawa <yukawa@google.com>
Date: Tue, 7 Jun 2022 14:00:04 -0700
Subject: [PATCH] Remove unused UnbindReason.ACCESSIBILITY_SERVICE_DISABLED

UnbindReason.ACCESSIBILITY_SERVICE_DISABLED was introduced when we
implemented A11yIME [1], but it turns out that it has not been passed
to the IME client.

Let's remove it if it's not used.

 [1]: Ia651a811093a939d00c081be1961e24ed3ad0356
      fb17e5ae7a9e1a095d114d8dde76f14578b6c233

Bug: 234882948
Test: presubmit
Change-Id: Ib6c011d4b5f6fb39f0bda84d51b73a21205ef0ca
---
 .../com/android/internal/inputmethod/InputMethodDebug.java    | 2 --
 core/java/com/android/internal/inputmethod/UnbindReason.java  | 4 +---
 .../android/server/inputmethod/InputMethodManagerService.java | 4 +---
 3 files changed, 2 insertions(+), 8 deletions(-)

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.