Commit 12baf6d6 authored by Yue Li's avatar Yue Li Committed by Commit Bot

Disable voice enrollment status sync

CQ_INCLUDE_TRYBOTS=luci.chrome.try:linux-chromeos-chrome

Bug: 950144
Test: Manual Test
Change-Id: I9fc6ae5e228e8f2c5697345cbd90445ae045fc05
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1566412
Commit-Queue: Yue Li <updowndota@chromium.org>
Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#650499}
parent 001f6e21
...@@ -167,30 +167,8 @@ void AssistantSettingsManagerImpl::StopSpeakerIdEnrollment( ...@@ -167,30 +167,8 @@ void AssistantSettingsManagerImpl::StopSpeakerIdEnrollment(
void AssistantSettingsManagerImpl::SyncSpeakerIdEnrollmentStatus() { void AssistantSettingsManagerImpl::SyncSpeakerIdEnrollmentStatus() {
DCHECK(service_->main_task_runner()->RunsTasksInCurrentSequence()); DCHECK(service_->main_task_runner()->RunsTasksInCurrentSequence());
if (service_->assistant_state()->allowed_state() != // Disable status check on M74 since we do not have the API available.
ash::mojom::AssistantAllowedState::ALLOWED || return;
!base::FeatureList::IsEnabled(
assistant::features::kAssistantVoiceMatch)) {
return;
}
// TODO(updowndota): Add a dedicate API for fetching enrollment status.
assistant_client::SpeakerIdEnrollmentConfig client_config;
client_config.user_id = kUserID;
client_config.skip_cloud_enrollment = false;
assistant_manager_service_->assistant_manager_internal()
->StartSpeakerIdEnrollment(
client_config,
[weak_ptr = weak_factory_.GetWeakPtr(),
task_runner = service_->main_task_runner()](
const assistant_client::SpeakerIdEnrollmentUpdate& update) {
task_runner->PostTask(
FROM_HERE,
base::BindOnce(&AssistantSettingsManagerImpl::
HandleSpeakerIdEnrollmentStatusSync,
weak_ptr, update));
});
} }
void AssistantSettingsManagerImpl::HandleSpeakerIdEnrollmentUpdate( void AssistantSettingsManagerImpl::HandleSpeakerIdEnrollmentUpdate(
...@@ -222,34 +200,6 @@ void AssistantSettingsManagerImpl::HandleSpeakerIdEnrollmentUpdate( ...@@ -222,34 +200,6 @@ void AssistantSettingsManagerImpl::HandleSpeakerIdEnrollmentUpdate(
} }
} }
void AssistantSettingsManagerImpl::HandleSpeakerIdEnrollmentStatusSync(
const assistant_client::SpeakerIdEnrollmentUpdate& update) {
DCHECK(service_->main_task_runner()->RunsTasksInCurrentSequence());
switch (update.state) {
case SpeakerIdEnrollmentState::LISTEN:
speaker_id_enrollment_done_ = false;
// Stop the enrollment since we already get the status.
if (!speaker_id_enrollment_client_) {
StopSpeakerIdEnrollment(base::DoNothing());
// If there is no voice model found, launch the enrollment flow.
service_->assistant_controller()->StartSpeakerIdEnrollmentFlow();
}
break;
case SpeakerIdEnrollmentState::DONE:
speaker_id_enrollment_done_ = true;
assistant_manager_service_->UpdateInternalOptions(
assistant_manager_service_->assistant_manager_internal());
break;
case SpeakerIdEnrollmentState::PROCESS:
case SpeakerIdEnrollmentState::FAILURE:
case SpeakerIdEnrollmentState::INIT:
case SpeakerIdEnrollmentState::CHECK:
case SpeakerIdEnrollmentState::UPLOAD:
case SpeakerIdEnrollmentState::FETCH:
break;
}
}
void AssistantSettingsManagerImpl::HandleStopSpeakerIdEnrollment( void AssistantSettingsManagerImpl::HandleStopSpeakerIdEnrollment(
base::RepeatingCallback<void()> callback) { base::RepeatingCallback<void()> callback) {
DCHECK(service_->main_task_runner()->RunsTasksInCurrentSequence()); DCHECK(service_->main_task_runner()->RunsTasksInCurrentSequence());
......
...@@ -53,8 +53,6 @@ class AssistantSettingsManagerImpl : public AssistantSettingsManager { ...@@ -53,8 +53,6 @@ class AssistantSettingsManagerImpl : public AssistantSettingsManager {
void HandleSpeakerIdEnrollmentUpdate( void HandleSpeakerIdEnrollmentUpdate(
const assistant_client::SpeakerIdEnrollmentUpdate& update); const assistant_client::SpeakerIdEnrollmentUpdate& update);
void HandleStopSpeakerIdEnrollment(base::RepeatingCallback<void()> callback); void HandleStopSpeakerIdEnrollment(base::RepeatingCallback<void()> callback);
void HandleSpeakerIdEnrollmentStatusSync(
const assistant_client::SpeakerIdEnrollmentUpdate& update);
Service* const service_; Service* const service_;
AssistantManagerServiceImpl* const assistant_manager_service_; AssistantManagerServiceImpl* const assistant_manager_service_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment