Commit cd895a03 authored by Danila Kuzmin's avatar Danila Kuzmin Committed by Commit Bot

EnableAdbSideloadingScreen: Add check for existence of |view_| before

unbinding

Bug: 1142565
Change-Id: I4d201961aba5e78ec1c3d9c0291c8bba6cf4c36b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2517523
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825745}
parent 5e41247f
...@@ -46,13 +46,13 @@ EnableAdbSideloadingScreen::EnableAdbSideloadingScreen( ...@@ -46,13 +46,13 @@ EnableAdbSideloadingScreen::EnableAdbSideloadingScreen(
OobeScreenPriority::SCREEN_DEVICE_DEVELOPER_MODIFICATION), OobeScreenPriority::SCREEN_DEVICE_DEVELOPER_MODIFICATION),
view_(view), view_(view),
exit_callback_(exit_callback) { exit_callback_(exit_callback) {
DCHECK(view_); if (view_)
view_->Bind(this); view_->Bind(this);
} }
EnableAdbSideloadingScreen::~EnableAdbSideloadingScreen() { EnableAdbSideloadingScreen::~EnableAdbSideloadingScreen() {
DCHECK(view_); if (view_)
view_->Unbind(); view_->Unbind();
} }
// static // static
...@@ -100,7 +100,8 @@ void EnableAdbSideloadingScreen::OnQueryAdbSideload( ...@@ -100,7 +100,8 @@ void EnableAdbSideloadingScreen::OnQueryAdbSideload(
return; return;
} }
DCHECK(view_); if (!view_)
return;
EnableAdbSideloadingScreenView::UIState ui_state; EnableAdbSideloadingScreenView::UIState ui_state;
switch (response_code) { switch (response_code) {
case SessionManagerClient::AdbSideloadResponseCode::SUCCESS: case SessionManagerClient::AdbSideloadResponseCode::SUCCESS:
...@@ -121,8 +122,8 @@ void EnableAdbSideloadingScreen::OnQueryAdbSideload( ...@@ -121,8 +122,8 @@ void EnableAdbSideloadingScreen::OnQueryAdbSideload(
} }
void EnableAdbSideloadingScreen::HideImpl() { void EnableAdbSideloadingScreen::HideImpl() {
DCHECK(view_); if (view_)
view_->Hide(); view_->Hide();
} }
void EnableAdbSideloadingScreen::OnCancel() { void EnableAdbSideloadingScreen::OnCancel() {
...@@ -149,9 +150,10 @@ void EnableAdbSideloadingScreen::OnEnableAdbSideload( ...@@ -149,9 +150,10 @@ void EnableAdbSideloadingScreen::OnEnableAdbSideload(
case SessionManagerClient::AdbSideloadResponseCode::NEED_POWERWASH: case SessionManagerClient::AdbSideloadResponseCode::NEED_POWERWASH:
case SessionManagerClient::AdbSideloadResponseCode::FAILED: case SessionManagerClient::AdbSideloadResponseCode::FAILED:
LogEvent(AdbSideloadingPromptEvent::kFailedToEnable); LogEvent(AdbSideloadingPromptEvent::kFailedToEnable);
DCHECK(view_); if (view_) {
view_->SetScreenState( view_->SetScreenState(
EnableAdbSideloadingScreenView::UIState::UI_STATE_ERROR); EnableAdbSideloadingScreenView::UIState::UI_STATE_ERROR);
}
break; break;
} }
} }
......
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