diff options
| author | Andrew Solovay <asolovay@google.com> | 2019-06-10 11:43:31 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-10 11:43:31 -0700 |
| commit | be2a68c47e38786f4002cf15976b38233fa04773 (patch) | |
| tree | a9a413b76fc6e2e211c8c067a0bf0d579ccdfc1b /core/java/android/app/Activity.java | |
| parent | 1fd7d07ddf644871c55d59385109878a17a372da (diff) | |
| parent | b230dd4fe69d043ce90b5960295effb2464dc133 (diff) | |
Merge "docs: Fixing broken HTML" into qt-dev
am: b230dd4fe6
Change-Id: I1bd88c7508c580b69078f62a352958106cb9ae13
Diffstat (limited to 'core/java/android/app/Activity.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 |