Commit 12a341d4 authored by Xiaohui Chen's avatar Xiaohui Chen Committed by Commit Bot

ambient: check enabled when dismissing UI

Bug: b:168817491
Change-Id: I4269b354c686613cc172b2e5ffdac6acd27ab780
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2464008
Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: default avatarTao Wu <wutao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815842}
parent 64ddd3c1
...@@ -429,6 +429,11 @@ void AmbientController::ShowUi() { ...@@ -429,6 +429,11 @@ void AmbientController::ShowUi() {
void AmbientController::ShowHiddenUi() { void AmbientController::ShowHiddenUi() {
DVLOG(1) << __func__; DVLOG(1) << __func__;
if (!IsAmbientModeEnabled()) {
LOG(WARNING) << "Ambient mode is not allowed.";
return;
}
ambient_ui_model_.SetUiVisibility(AmbientUiVisibility::kHidden); ambient_ui_model_.SetUiVisibility(AmbientUiVisibility::kHidden);
} }
...@@ -510,10 +515,17 @@ void AmbientController::RequestAccessToken( ...@@ -510,10 +515,17 @@ void AmbientController::RequestAccessToken(
} }
void AmbientController::DismissUI() { void AmbientController::DismissUI() {
if (LockScreen::HasInstance()) if (!IsAmbientModeEnabled()) {
ShowHiddenUi();
else
CloseUi(); CloseUi();
return;
}
if (LockScreen::HasInstance()) {
ShowHiddenUi();
return;
}
CloseUi();
} }
AmbientBackendModel* AmbientController::GetAmbientBackendModel() { AmbientBackendModel* AmbientController::GetAmbientBackendModel() {
......
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