| Index: chromeos/network/network_state.cc
|
| diff --git a/chromeos/network/network_state.cc b/chromeos/network/network_state.cc
|
| index a20e22ca3c4881bac3b47ce599f6751fd72d90af..398e8f9b4b36098fe26026d4d1676a06fabe294f 100644
|
| --- a/chromeos/network/network_state.cc
|
| +++ b/chromeos/network/network_state.cc
|
| @@ -15,6 +15,7 @@
|
| #include "chromeos/network/network_util.h"
|
| #include "chromeos/network/onc/onc_utils.h"
|
| #include "chromeos/network/shill_property_util.h"
|
| +#include "chromeos/network/tether_constants.h"
|
| #include "components/device_event_log/device_event_log.h"
|
| #include "third_party/cros_system_api/dbus/service_constants.h"
|
|
|
| @@ -292,6 +293,15 @@ void NetworkState::GetStateProperties(base::DictionaryValue* dictionary) const {
|
| dictionary->SetBooleanWithoutPathExpansion(shill::kOutOfCreditsProperty,
|
| cellular_out_of_credits());
|
| }
|
| +
|
| + // Tether properties
|
| + if (NetworkTypePattern::Tether().MatchesType(type())) {
|
| + dictionary->SetIntegerWithoutPathExpansion(kTetherBatteryPercentage,
|
| + battery_percentage());
|
| + dictionary->SetStringWithoutPathExpansion(kTetherCarrier, carrier());
|
| + dictionary->SetIntegerWithoutPathExpansion(kTetherSignalStrength,
|
| + signal_strength());
|
| + }
|
| }
|
|
|
| void NetworkState::IPConfigPropertiesChanged(
|
| @@ -350,6 +360,21 @@ void NetworkState::set_connection_state(const std::string connection_state) {
|
| connection_state_ = connection_state;
|
| }
|
|
|
| +void NetworkState::SetTetherSignalStrength(int signal_strength) {
|
| + DCHECK(kTypeTether == type());
|
| + signal_strength_ = signal_strength;
|
| +}
|
| +
|
| +void NetworkState::SetBatteryPercentage(int battery_percentage) {
|
| + DCHECK(kTypeTether == type());
|
| + battery_percentage_ = battery_percentage;
|
| +}
|
| +
|
| +void NetworkState::SetCarrier(const std::string& carrier) {
|
| + DCHECK(kTypeTether == type());
|
| + carrier_ = carrier;
|
| +}
|
| +
|
| bool NetworkState::IsDynamicWep() const {
|
| return security_class_ == shill::kSecurityWep &&
|
| eap_key_mgmt_ == shill::kKeyManagementIEEE8021X;
|
|
|