summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ming-Shin Lu <lumark@google.com> 2021-03-01 12:21:01 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-03-01 12:21:01 +0000
commitea1be967329819bbbf8c1d06dfc65f8c1b9bb0f9 (patch)
treea8b78e9987bd836b24725f34378f0a6054b13de3
parent6c80c464e0b6d2c9fdc1904b14aa34e6ec17db0a (diff)
parent2d29a3ad85da42de6973a96033c72ff9de3ad6b9 (diff)
Merge "Remove duplicated startInputUncheckedLocked invocation" into sc-dev
-rw-r--r--services/core/java/com/android/server/inputmethod/InputMethodManagerService.java7
1 files 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 7dcb3a87e5f0..0dc7445d5b4e 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;
}