From c170229182b0f5551f02c424cbe1224892646abe Mon Sep 17 00:00:00 2001
From: Nikolas Havrikov <havrikov@google.com>
Date: Mon, 15 Nov 2021 15:40:50 +0100
Subject: [PATCH] Move setting curId and bindTime for symmetry

Bug: 205676419
Test: make
Change-Id: I5c24d8e833769a7b1cbd055940a3bca70075bdee
---
 .../server/inputmethod/InputMethodBindingController.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java b/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java
index 46887b6e91a52..82d9cdff4fd1b 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java
@@ -399,7 +399,10 @@ final class InputMethodBindingController {
         mCurIntent = createImeBindingIntent(info.getComponent());
 
         if (bindCurrentInputMethodServiceMainConnectionLocked()) {
-            addFreshWindowTokenLocked(displayIdToShowIme, info.getId());
+            mCurId = info.getId();
+            mLastBindTime = SystemClock.uptimeMillis();
+
+            addFreshWindowTokenLocked(displayIdToShowIme);
             return new InputBindResult(
                     InputBindResult.ResultCode.SUCCESS_WAITING_IME_BINDING,
                     null, null, mCurId, mCurSeq, false);
@@ -424,11 +427,9 @@ final class InputMethodBindingController {
     }
 
     @GuardedBy("mMethodMap")
-    private void addFreshWindowTokenLocked(int displayIdToShowIme, String methodId) {
+    private void addFreshWindowTokenLocked(int displayIdToShowIme) {
         Binder token = new Binder();
         mCurToken = token;
-        mLastBindTime = SystemClock.uptimeMillis();
-        mCurId = methodId;
 
         mService.setCurTokenDisplayId(displayIdToShowIme);