summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-10-17 02:37:14 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-10-17 02:37:14 +0000
commit952eb9bcbfe1d2cf4a99c4995419f345a268d72a (patch)
treea0996d64302aada0aeb4cd76fc170456342a9caa
parentbfe89a99279fd4db6190c915ab191471a5b166dc (diff)
parentcaaa1d3d2d3248dcc1ad1ea4c65d5a8949fb4219 (diff)
Merge "Unextract InputMethodManagerService#startInputInnerLocked()"
-rw-r--r--services/core/java/com/android/server/inputmethod/InputMethodManagerService.java6
1 files changed, 0 insertions, 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 bd08eee84827..67ec2380033d 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;
}