diff options
| author | 2019-06-10 11:54:22 -0700 | |
|---|---|---|
| committer | 2019-06-10 11:54:22 -0700 | |
| commit | 83388b8840cf9f0df512e2ca280af442f29d9d82 (patch) | |
| tree | d5dd191a27e347d028e085611ed8c1491614e117 | |
| parent | b1d03b902d85550ebd760d449630338003a68a1f (diff) | |
| parent | 6de1a4c3759a9d8b009927c5e851a921fb1a5e06 (diff) | |
Merge "docs: Fixing broken HTML" into qt-dev am: b230dd4fe6
am: 6de1a4c375
Change-Id: I4fe3ccc877368e25606108cb8f304c0bc6761e63
| -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 |