From 2d29a3ad85da42de6973a96033c72ff9de3ad6b9 Mon Sep 17 00:00:00 2001 From: Ming-Shin Lu Date: Fri, 26 Feb 2021 21:32:17 +0800 Subject: Remove duplicated startInputUncheckedLocked invocation As CL[1] removed unused "debug.optimize_startinput" flag logic in IMMS#startInputOrWindowGainedFocusInternalLocked, we can even remove duplicated startInputUncheckedLocked invocation to simpfy the code block of the input didn't start part. Note that this CL is a mechanical code refactoring, it should not have any behavior change. [1]: Ie7b09f16e517c0550ac495a8a8c8ef20abb6938e Bug: 171827834 Test: atest CtsInputMethodTestCases Change-Id: I8fbb2c6ad4dfbd8388d1780375f53fd750ebd83e --- .../com/android/server/inputmethod/InputMethodManagerService.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index 1e6658930840..b4b53798e34d 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -3647,12 +3647,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub hideCurrentInputLocked(mCurFocusedWindow, 0, null, SoftInputShowHideReason.HIDE_SAME_WINDOW_FOCUSED_WITHOUT_EDITOR); } - res = startInputUncheckedLocked(cs, inputContext, missingMethods, attribute, - startInputFlags, startInputReason); - } else { - res = startInputUncheckedLocked(cs, inputContext, missingMethods, attribute, - startInputFlags, startInputReason); } + res = startInputUncheckedLocked(cs, inputContext, missingMethods, attribute, + startInputFlags, startInputReason); } else { res = InputBindResult.NULL_EDITOR_INFO; } -- cgit v1.2.3-59-g8ed1b