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

Commit 979c16cc authored by Tom Chan's avatar Tom Chan Committed by Android (Google) Code Review
Browse files

Merge "Fix javadoc that references the non-existent WearableHotwordAudioConsumer" into main

parents c88b3341 4dea10af

core/java/android/app/wearable/WearableSensingManager.java

+10 −10
Original line number Diff line number Diff line
@@ -436,18 +436,18 @@ public class WearableSensingManager { 
    /**

     * Requests the wearable to start hotword recognition.

     *

     * <p>When this method is called, the system will attempt to provide a {@link

     * android.service.wearable.WearableHotwordAudioConsumer} to {@link WearableSensingService}.

     * After first-stage hotword is detected on a wearable, {@link WearableSensingService} should

     * send the hotword audio to the {@link android.service.wearable.WearableHotwordAudioConsumer},

     * which will forward the data to the {@link android.service.voice.HotwordDetectionService} for

     * <p>When this method is called, the system will attempt to provide a {@code

     * Consumer<android.service.voice.HotwordAudioStream>} to {@link WearableSensingService}. After

     * first-stage hotword is detected on a wearable, {@link WearableSensingService} should send the

     * hotword audio to the {@code Consumer<android.service.voice.HotwordAudioStream>}, which will

     * forward the data to the {@link android.service.voice.HotwordDetectionService} for

     * second-stage hotword validation. If hotword is detected there, the audio data will be

     * forwarded to the {@link android.service.voice.VoiceInteractionService}.

     *

     * <p>If the {@code targetVisComponentName} provided here is not null, when {@link

     * WearableSensingService} sends hotword audio to the {@link

     * android.service.wearable.WearableHotwordAudioConsumer}, the system will check whether the

     * {@link android.service.voice.VoiceInteractionService} at that time is {@code

     * WearableSensingService} sends hotword audio to the {@code

     * Consumer<android.service.voice.HotwordAudioStream>}, the system will check whether the {@link

     * android.service.voice.VoiceInteractionService} at that time is {@code

     * targetVisComponentName}. If not, the system will call {@link

     * WearableSensingService#onActiveHotwordAudioStopRequested()} and will not forward the audio

     * data to the current {@link android.service.voice.HotwordDetectionService} nor {@link
@@ -457,8 +457,8 @@ public class WearableSensingManager { 
     * android.service.voice.VoiceInteractionService} is the same as {@code targetVisComponentName}.

     * The check here is just a protection against race conditions.

     *

     * <p>Calling this method again will send a new {@link

     * android.service.wearable.WearableHotwordAudioConsumer} to {@link WearableSensingService}. For

     * <p>Calling this method again will send a new {@code

     * Consumer<android.service.voice.HotwordAudioStream>} to {@link WearableSensingService}. For

     * audio data sent to the new consumer, the system will perform the above check using the newly

     * provided {@code targetVisComponentName}. The {@link WearableSensingService} should not

     * continue to use the previous consumers after receiving a new one.