assistant: fix voice query

Bug: b:142244324
Test: locally build and able to start voice query
Change-Id: I5b3ce11a8b1944b1f6f013e4b39151887bfaf878
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1845432
Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: Tao Wu <wutao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703383}

chromeos/services/assistant/assistant_manager_service_impl.cc

@@ -321,6 +321,8 @@ void AssistantManagerServiceImpl::RegisterAlarmsTimersListener() {
 }
 
 void AssistantManagerServiceImpl::EnableListening(bool enable) {
+  if (!assistant_manager_)
+    return;
   assistant_manager_->EnableListening(enable);
 }
 

chromeos/services/assistant/service.cc

@@ -69,7 +69,7 @@ AssistantSettingsManager* g_settings_manager_override = nullptr;
 
 class Service::Context : public ServiceContext {
  public:
-  Context(Service* parent) : parent_(parent) {}
+  explicit Context(Service* parent) : parent_(parent) {}
   ~Context() override = default;
 
   // ServiceContext:
@@ -233,12 +233,19 @@ void Service::OnSessionActivated(bool activated) {
   DCHECK(client_);
   session_active_ = activated;
 
-  if (assistant_manager_service_->GetState() !=
-      AssistantManagerService::State::RUNNING) {
-    return;
+  bool is_assistant_running;
+  switch (assistant_manager_service_->GetState()) {
+    case AssistantManagerService::State::STOPPED:
+    case AssistantManagerService::State::STARTING:
+      is_assistant_running = false;
+      break;
+    case AssistantManagerService::State::STARTED:
+    case AssistantManagerService::State::RUNNING:
+      is_assistant_running = true;
+      break;
   }
-
-  client_->OnAssistantStatusChanged(activated /* running */);
+  client_->OnAssistantStatusChanged(is_assistant_running &&
+                                    activated /* running */);
   UpdateListeningState();
 }
 
@@ -513,11 +520,6 @@ void Service::AddAshSessionObserver() {
 void Service::UpdateListeningState() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
-  if (assistant_manager_service_->GetState() !=
-      AssistantManagerService::State::RUNNING) {
-    return;
-  }
-
   bool should_listen =
       !locked_ &&
       !assistant_state_.locked_full_screen_enabled().value_or(false) &&