From 0dc20ab2a08109568d4c835ed003b985f15651b5 Mon Sep 17 00:00:00 2001
From: Nikolas Havrikov <havrikov@google.com>
Date: Thu, 18 Nov 2021 17:36:58 +0100
Subject: [PATCH] Rename method clearing sessions appropriately

Bug: 205676419
Test: make
Change-Id: I92c43548a275f358e382a260314bb6fa4546ab42
---
 .../server/inputmethod/InputMethodBindingController.java      | 4 ++--
 .../android/server/inputmethod/InputMethodManagerService.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java b/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java
index 755c093498c0f..efc18f8659587 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java
@@ -342,7 +342,7 @@ final class InputMethodBindingController {
                     // We consider this to be a new bind attempt, since the system
                     // should now try to restart the service for us.
                     mLastBindTime = SystemClock.uptimeMillis();
-                    mService.clearCurMethodLocked();
+                    mService.clearClientSessionsLocked();
                     mService.clearInputShowRequestLocked();
                     mService.unbindCurrentClientLocked(UnbindReason.DISCONNECT_IME);
                 }
@@ -366,7 +366,7 @@ final class InputMethodBindingController {
         }
 
         mCurId = null;
-        mService.clearCurMethodLocked();
+        mService.clearClientSessionsLocked();
     }
 
     @GuardedBy("mMethodMap")
diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index 74871dcf26914..457dc561ed85a 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -2589,7 +2589,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
     }
 
     @GuardedBy("mMethodMap")
-    void clearCurMethodLocked() {
+    void clearClientSessionsLocked() {
         if (getCurMethod() != null) {
             final int numClients = mClients.size();
             for (int i = 0; i < numClients; ++i) {