Commit 4aeba35c authored by Yue Li's avatar Yue Li Committed by Commit Bot

Fix state check that breaks play store status

Adjust the order of method calls in OnStartFinished.
Replace the early return with a DCHECK.

Bug: None
Test: Manual Test
Change-Id: Ib269c1b98410f6b28ef2805409c1dd9a3d9115b8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1896244Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: default avatarTao Wu <wutao@chromium.org>
Commit-Queue: Yue Li <updowndota@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712278}
parent 9fd5ebb4
...@@ -335,11 +335,7 @@ void AssistantManagerServiceImpl::EnableHotword(bool enable) { ...@@ -335,11 +335,7 @@ void AssistantManagerServiceImpl::EnableHotword(bool enable) {
} }
void AssistantManagerServiceImpl::SetArcPlayStoreEnabled(bool enable) { void AssistantManagerServiceImpl::SetArcPlayStoreEnabled(bool enable) {
if (GetState() != State::RUNNING) { DCHECK(GetState() == State::RUNNING);
// Skip setting play store status if libassistant is not ready. The status
// will be set when it is ready.
return;
}
// Both LibAssistant and Chrome threads may access |display_connection_|. // Both LibAssistant and Chrome threads may access |display_connection_|.
// |display_connection_| is thread safe. // |display_connection_| is thread safe.
if (assistant::features::IsAppSupportEnabled()) if (assistant::features::IsAppSupportEnabled())
...@@ -1280,6 +1276,8 @@ void AssistantManagerServiceImpl::OnStartFinished() { ...@@ -1280,6 +1276,8 @@ void AssistantManagerServiceImpl::OnStartFinished() {
if (!assistant_manager_ || (GetState() == State::RUNNING)) if (!assistant_manager_ || (GetState() == State::RUNNING))
return; return;
SetStateAndInformObservers(State::RUNNING);
if (is_first_init) { if (is_first_init) {
is_first_init = false; is_first_init = false;
// Only sync status at the first init to prevent unexpected corner cases. // Only sync status at the first init to prevent unexpected corner cases.
...@@ -1300,12 +1298,10 @@ void AssistantManagerServiceImpl::OnStartFinished() { ...@@ -1300,12 +1298,10 @@ void AssistantManagerServiceImpl::OnStartFinished() {
if (media_manager) if (media_manager)
media_manager->AddListener(this); media_manager->AddListener(this);
if (assistant_state()->arc_play_store_enabled().has_value())
SetArcPlayStoreEnabled(assistant_state()->arc_play_store_enabled().value());
RegisterAlarmsTimersListener(); RegisterAlarmsTimersListener();
SetStateAndInformObservers(State::RUNNING); if (assistant_state()->arc_play_store_enabled().has_value())
SetArcPlayStoreEnabled(assistant_state()->arc_play_store_enabled().value());
} }
void AssistantManagerServiceImpl::OnAndroidAppListRefreshed( void AssistantManagerServiceImpl::OnAndroidAppListRefreshed(
......
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