Commit 33e0e0dc authored by Yue Li's avatar Yue Li Committed by Commit Bot

Override listening state for voice match training

While traning/retraining the voice model, override the hotword always on
state to true. Otherwise the training may fail when the device has no
Dsp support and disconnected to the power source.

Bug: b/139329513
Test: Manual Test
Change-Id: Ia1aeb93640935760271b045958d09109aa2826c8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1867180
Commit-Queue: Yue Li <updowndota@chromium.org>
Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707612}
parent a35f4e60
...@@ -54,6 +54,8 @@ AssistantOptInFlowScreenHandler::AssistantOptInFlowScreenHandler( ...@@ -54,6 +54,8 @@ AssistantOptInFlowScreenHandler::AssistantOptInFlowScreenHandler(
} }
AssistantOptInFlowScreenHandler::~AssistantOptInFlowScreenHandler() { AssistantOptInFlowScreenHandler::~AssistantOptInFlowScreenHandler() {
if (client_binding_)
StopSpeakerIdEnrollment();
if (ash::AssistantState::Get()) if (ash::AssistantState::Get())
ash::AssistantState::Get()->RemoveObserver(this); ash::AssistantState::Get()->RemoveObserver(this);
if (screen_) if (screen_)
......
...@@ -206,6 +206,7 @@ class COMPONENT_EXPORT(ASSISTANT_SERVICE) AssistantManagerServiceImpl ...@@ -206,6 +206,7 @@ class COMPONENT_EXPORT(ASSISTANT_SERVICE) AssistantManagerServiceImpl
assistant_client::AssistantManagerInternal* assistant_manager_internal() { assistant_client::AssistantManagerInternal* assistant_manager_internal() {
return assistant_manager_internal_; return assistant_manager_internal_;
} }
CrosPlatformApi* platform_api() { return platform_api_.get(); }
// media_session::mojom::MediaControllerObserver overrides: // media_session::mojom::MediaControllerObserver overrides:
void MediaSessionInfoChanged( void MediaSessionInfoChanged(
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "chromeos/dbus/util/version_loader.h" #include "chromeos/dbus/util/version_loader.h"
#include "chromeos/services/assistant/assistant_manager_service_impl.h" #include "chromeos/services/assistant/assistant_manager_service_impl.h"
#include "chromeos/services/assistant/constants.h" #include "chromeos/services/assistant/constants.h"
#include "chromeos/services/assistant/cros_platform_api.h"
#include "chromeos/services/assistant/public/features.h" #include "chromeos/services/assistant/public/features.h"
#include "chromeos/services/assistant/public/proto/assistant_device_settings_ui.pb.h" #include "chromeos/services/assistant/public/proto/assistant_device_settings_ui.pb.h"
#include "chromeos/services/assistant/public/proto/settings_ui.pb.h" #include "chromeos/services/assistant/public/proto/settings_ui.pb.h"
...@@ -126,6 +127,8 @@ void AssistantSettingsManagerImpl::StartSpeakerIdEnrollment( ...@@ -126,6 +127,8 @@ void AssistantSettingsManagerImpl::StartSpeakerIdEnrollment(
DCHECK(HasStarted(assistant_manager_service_)); DCHECK(HasStarted(assistant_manager_service_));
DCHECK(main_task_runner()->RunsTasksInCurrentSequence()); DCHECK(main_task_runner()->RunsTasksInCurrentSequence());
assistant_manager_service_->platform_api()->SetMicState(true);
if (!assistant_manager_service_->assistant_manager_internal()) if (!assistant_manager_service_->assistant_manager_internal())
return; return;
...@@ -153,6 +156,8 @@ void AssistantSettingsManagerImpl::StopSpeakerIdEnrollment( ...@@ -153,6 +156,8 @@ void AssistantSettingsManagerImpl::StopSpeakerIdEnrollment(
DCHECK(HasStarted(assistant_manager_service_)); DCHECK(HasStarted(assistant_manager_service_));
DCHECK(main_task_runner()->RunsTasksInCurrentSequence()); DCHECK(main_task_runner()->RunsTasksInCurrentSequence());
assistant_manager_service_->platform_api()->SetMicState(false);
if (!assistant_manager_service_->assistant_manager_internal()) { if (!assistant_manager_service_->assistant_manager_internal()) {
std::move(callback).Run(); std::move(callback).Run();
return; return;
......
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