diff options
| author | Vitaly Buka <vitalybuka@google.com> | 2016-02-26 20:06:56 -0800 |
|---|---|---|
| committer | Vitaly Buka <vitalybuka@google.com> | 2016-02-26 20:13:38 -0800 |
| commit | 5db1247369bbf6abed9fbe0016e3a112a960bd4b (patch) | |
| tree | b65a959fe545a68779e45b229a82c0dde51c6e3b | |
| parent | 026dce2bce26ca52933ce10e200a196a6b59a63c (diff) | |
| download | weaved-5db1247369bbf6abed9fbe0016e3a112a960bd4b.tar.gz | |
Return calculated values in IsWifi*Supported
Also never downgrade is_*_supported_ when property changed, to avoid
inconsistencies with multiple adapters.
BUG: 27070625
Change-Id: I10bd6e13de4c26c57e1816832ad54c8326e4cab8
| -rw-r--r-- | buffet/shill_client.cc | 2 | ||||
| -rw-r--r-- | buffet/shill_client.h | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/buffet/shill_client.cc b/buffet/shill_client.cc index dea039d..5649762 100644 --- a/buffet/shill_client.cc +++ b/buffet/shill_client.cc @@ -347,8 +347,6 @@ void ShillClient::OnDevicePropertyChange(const ObjectPath& device_path, const string& property_name, const Any& property_value) { if (property_name == shill::kWifiSupportedFrequenciesProperty) { - is_24_supported_ = false; - is_50_supported_ = false; for (uint16_t val : property_value.TryGet<std::vector<uint16_t>>()) { if (2400 <= val && val <= 2500) is_24_supported_ = true; diff --git a/buffet/shill_client.h b/buffet/shill_client.h index 6407a33..517cd91 100644 --- a/buffet/shill_client.h +++ b/buffet/shill_client.h @@ -56,10 +56,8 @@ class ShillClient final : public weave::provider::Network, const weave::DoneCallback& callback) override; void StartAccessPoint(const std::string& ssid) override; void StopAccessPoint() override; - bool IsWifi24Supported() const override { return true; } - // TODO(avakulenko): See if we can get appropriate information from Shill - // regarding 5.0 GHz support. - bool IsWifi50Supported() const override { return false; } + bool IsWifi24Supported() const override { return is_24_supported_; } + bool IsWifi50Supported() const override { return is_50_supported_; } private: struct DeviceState { |