Commit d639d090 authored by Victor Hsieh's avatar Victor Hsieh Committed by Commit Bot

Skip querying adb sideloading info if not supported

Test: No longer seeing warning at login screen on unsupported device
Test: Still seeing warning at login screen on unsupported device
Bug: b/144978786
Change-Id: I1c73fbeab03354a4dd3d43bde615fc242c5c46e4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1946884Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Victor Hsieh <victorhsieh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721099}
parent 5daeab43
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/bind_helpers.h" #include "base/bind_helpers.h"
#include "base/feature_list.h"
#include "base/stl_util.h" #include "base/stl_util.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
...@@ -19,6 +20,7 @@ ...@@ -19,6 +20,7 @@
#include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/grit/chromium_strings.h" #include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h" #include "chrome/grit/generated_resources.h"
#include "chromeos/constants/chromeos_features.h"
#include "chromeos/dbus/util/version_loader.h" #include "chromeos/dbus/util/version_loader.h"
#include "chromeos/settings/cros_settings_names.h" #include "chromeos/settings/cros_settings_names.h"
#include "chromeos/strings/grit/chromeos_strings.h" #include "chromeos/strings/grit/chromeos_strings.h"
...@@ -99,11 +101,15 @@ void VersionInfoUpdater::StartUpdate(bool is_official_build) { ...@@ -99,11 +101,15 @@ void VersionInfoUpdater::StartUpdate(bool is_official_build) {
device::BluetoothAdapterFactory::GetAdapter(base::BindOnce( device::BluetoothAdapterFactory::GetAdapter(base::BindOnce(
&VersionInfoUpdater::OnGetAdapter, weak_pointer_factory_.GetWeakPtr())); &VersionInfoUpdater::OnGetAdapter, weak_pointer_factory_.GetWeakPtr()));
// Get ADB sideloading status. // Get ADB sideloading status if supported on device. Otherwise, default is to
chromeos::SessionManagerClient* client = // not show.
chromeos::SessionManagerClient::Get(); if (base::FeatureList::IsEnabled(
client->QueryAdbSideload(base::Bind(&VersionInfoUpdater::OnQueryAdbSideload, chromeos::features::kArcAdbSideloadingFeature)) {
weak_pointer_factory_.GetWeakPtr())); chromeos::SessionManagerClient* client =
chromeos::SessionManagerClient::Get();
client->QueryAdbSideload(base::Bind(&VersionInfoUpdater::OnQueryAdbSideload,
weak_pointer_factory_.GetWeakPtr()));
}
} }
base::Optional<bool> VersionInfoUpdater::IsSystemInfoEnforced() const { base::Optional<bool> VersionInfoUpdater::IsSystemInfoEnforced() const {
......
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