Commit 314111f7 authored by Thomas Tellier's avatar Thomas Tellier Committed by Commit Bot

[CrOS] Remove DCHECK causing crash when ADB notified before system info

On the login screen, ADB sideloading enabled could be notified before system info such as os_version_label_text, enterprise_info_text and bluetooth_name are set, resulting into a failed DCHECK.

Bug: 1141348
Change-Id: I0b607d779a1995f22d171d204cd4ca1299c2039c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2515681Reviewed-by: default avatarDenis Kuznetsov [CET] <antrim@chromium.org>
Commit-Queue: Thomas Tellier <tellier@google.com>
Cr-Commit-Position: refs/heads/master@{#823493}
parent 44db1f67
......@@ -1240,9 +1240,6 @@ void LockContentsView::OnSystemInfoChanged(
const std::string& enterprise_info_text,
const std::string& bluetooth_name,
bool adb_sideloading_enabled) {
DCHECK(!os_version_label_text.empty() || !enterprise_info_text.empty() ||
!bluetooth_name.empty());
// Helper function to create a label for the system info view.
auto create_info_label = []() {
auto label = std::make_unique<views::Label>();
......@@ -1282,6 +1279,7 @@ void LockContentsView::OnSystemInfoChanged(
LayoutTopHeader();
// TODO(crbug.com/1141348): Separate ADB sideloading from system info changed.
// Note that if ADB is enabled and the device is enrolled, only the ADB
// warning message will be displayed.
if (adb_sideloading_enabled)
......
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