diff options
| author | Andrew Solovay <asolovay@google.com> | 2019-06-10 18:23:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-10 18:23:40 +0000 |
| commit | b230dd4fe69d043ce90b5960295effb2464dc133 (patch) | |
| tree | fa1516f10ef0f37a4db1c50c0f6b6bf01921acc0 /core/java | |
| parent | fcc4d76a9730b70ef975a11bb04001611ba7a4b5 (diff) | |
| parent | 7ad2170f4eab3027327dcdd3f843fd7548bd2a18 (diff) | |
Merge "docs: Fixing broken HTML" into qt-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/Activity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 2eb09020b428..dc52c52cca1f 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -2330,7 +2330,7 @@ public class Activity extends ContextThemeWrapper * calling {@link VoiceInteractor#notifyDirectActionsChanged()}. * * <p>To get the voice interactor you need to call {@link #getVoiceInteractor()} - * which would return non <code>null<c/ode> only if there is an ongoing voice + * which would return non <code>null</code> only if there is an ongoing voice * interaction session. You an also detect when the voice interactor is no * longer valid because the voice interaction session that is backing is finished * by calling {@link VoiceInteractor#registerOnDestroyedCallback(Executor, Runnable)}. @@ -2339,7 +2339,7 @@ public class Activity extends ContextThemeWrapper * before {@link #onStop()} is being called. * * <p>You should pass to the callback the currently supported direct actions which - * cannot be <code>null</code> or contain <code>null</null> elements. + * cannot be <code>null</code> or contain <code>null</code> elements. * * <p>You should return the action list as soon as possible to ensure the consumer, * for example the assistant, is as responsive as possible which would improve user |