Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "docs: Fixing broken HTML" into qt-dev

Browse Source 
am: b230dd4fe6

Change-Id: I3d8716ebdc0d58ee33ef1d84e881888bf6c6d956
This commit is contained in:
Andrew Solovay
2019-06-10 11:46:35 -07:00
committed by android-build-merger
parent 0b81bdb1b0 b230dd4fe6
commit 6de1a4c375
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/Activity.java
View File

@@ -2330,7 +2330,7 @@ public class Activity extends ContextThemeWrapper
* calling {@link VoiceInteractor#notifyDirectActionsChanged()}. * calling {@link VoiceInteractor#notifyDirectActionsChanged()}.
* *
* <p>To get the voice interactor you need to call {@link #getVoiceInteractor()} * <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 * interaction session. You an also detect when the voice interactor is no
* longer valid because the voice interaction session that is backing is finished * longer valid because the voice interaction session that is backing is finished
* by calling {@link VoiceInteractor#registerOnDestroyedCallback(Executor, Runnable)}. * by calling {@link VoiceInteractor#registerOnDestroyedCallback(Executor, Runnable)}.
@@ -2339,7 +2339,7 @@ public class Activity extends ContextThemeWrapper
* before {@link #onStop()} is being called. * before {@link #onStop()} is being called.
* *
* <p>You should pass to the callback the currently supported direct actions which * <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, * <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 * for example the assistant, is as responsive as possible which would improve user