From caaa1d3d2d3248dcc1ad1ea4c65d5a8949fb4219 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Wed, 17 Oct 2018 10:33:13 +0800 Subject: [PATCH] Unextract InputMethodManagerService#startInputInnerLocked() With my previous CL [1], IMMS#startInputInnerLocked() is called only from IMMS#startInputUncheckedLocked(). By unextracting IMMS#startInputInnerLocked() again, it would be much easier for us to understand what IMMS#startInputUncheckedLocked() is actually doing. To decouple actual behavior change from cosmetic code refactorings, this CL does nothing except for merging IMMS#startInputInnerLocked() into IMMS#startInputUncheckedLocked(). There should be no behavior change. Non trivial behavior simplifications will be done in subsequent CLs. [1]: I52f6c4cd1e02be3a59e9a87e33b0a44f4ba8d80b f91a2b102b4bd28036e7f31f5888f6f4629d9d70 Bug: 117730713 Test: atest ActivityManagerMultiDisplayTests Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases Test: atest FrameworksCoreTests:android.view.inputmethod.InputMethodManagerTest Change-Id: I71e259fa447dd06ff02b9ef8c958dc70bbce86ea --- .../server/inputmethod/InputMethodManagerService.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index bd08eee84827c..67ec2380033d0 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -1963,11 +1963,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } } - return startInputInnerLocked(); - } - - @GuardedBy("mMethodMap") - InputBindResult startInputInnerLocked() { if (mCurMethodId == null) { return InputBindResult.NO_IME; } @@ -2005,7 +2000,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub // Wait, the client no longer has access to the display. return InputBindResult.INVALID_DISPLAY_ID; } - final int displayId = mCurFocusedWindowClient.selfReportedDisplayId; mCurTokenDisplayId = (displayId != INVALID_DISPLAY) ? displayId : DEFAULT_DISPLAY; }