commit ea1be967329819bbbf8c1d06dfc65f8c1b9bb0f9
author Ming-Shin Lu <lumark@google.com> Mon Mar 01 12:21:01 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 01 12:21:01 2021 +0000
tree a8b78e9987bd836b24725f34378f0a6054b13de3
parent 6c80c464e0b6d2c9fdc1904b14aa34e6ec17db0a
parent 2d29a3ad85da42de6973a96033c72ff9de3ad6b9

Merge "Remove duplicated startInputUncheckedLocked invocation" into sc-dev

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index 7dcb3a8..0dc7445 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 @@
                         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;
             }