Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be2a68c4 authored by Andrew Solovay's avatar Andrew Solovay Committed by android-build-merger
Browse files

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

am: b230dd4f

Change-Id: I1bd88c7508c580b69078f62a352958106cb9ae13
parents 1fd7d07d b230dd4f

core/java/android/app/Activity.java

+2 −2
Original line number Diff line number Diff line
@@ -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