diff options
| author | Andrew Solovay <asolovay@google.com> | 2018-10-04 14:59:09 -0700 |
|---|---|---|
| committer | Andrew Solovay <asolovay@google.com> | 2018-10-04 22:50:39 +0000 |
| commit | d10e384d6cd51bf2e15b378a6ab80fa24df476ee (patch) | |
| tree | 677518664b57fee2443ab2996d6afc3de2b330f9 /core/java/android/inputmethodservice/InputMethodService.java | |
| parent | 5d82f62bdb75c28b87fd00598c8ac9f900ac81be (diff) | |
| parent | a3e34fe9fe4e2a8d0932e574721e5a8b94396c5e (diff) | |
resolve merge conflicts of a3e34fe9fe4e2a8d0932e574721e5a8b94396c5e to pi-dev-plus-aosp
Bug: None
Test: Eyeballed (comment-only change).
Change-Id: Ia644cde66376b2bddeb27bb2a147b3266037aa2c
Exempt-From-Owner-Approval: Docs-only change
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
Diffstat (limited to 'core/java/android/inputmethodservice/InputMethodService.java')
| -rw-r--r-- | core/java/android/inputmethodservice/InputMethodService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index d165889e8325..649c9659d043 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -2084,7 +2084,7 @@ public class InputMethodService extends AbstractInputMethodService { * Called when the application has reported a new location of its text * cursor. This is only called if explicitly requested by the input method. * The default implementation does nothing. - * @deprecated Use {#link onUpdateCursorAnchorInfo(CursorAnchorInfo)} instead. + * @deprecated Use {@link #onUpdateCursorAnchorInfo(CursorAnchorInfo)} instead. */ @Deprecated public void onUpdateCursor(Rect newCursor) { @@ -2151,7 +2151,7 @@ public class InputMethodService extends AbstractInputMethodService { } /** - * @return {#link ExtractEditText} if it is considered to be visible and active. Otherwise + * @return {@link ExtractEditText} if it is considered to be visible and active. Otherwise * {@code null} is returned. */ private ExtractEditText getExtractEditTextIfVisible() { |