Chromium Code Reviews| Index: chromeos/network/network_configuration_handler.cc |
| diff --git a/chromeos/network/network_configuration_handler.cc b/chromeos/network/network_configuration_handler.cc |
| index 707894cafd04a6632de9ca75dfc29b1ff81cb0c5..f6a128a22cf4048063bc561519e9f143f6f74b27 100644 |
| --- a/chromeos/network/network_configuration_handler.cc |
| +++ b/chromeos/network/network_configuration_handler.cc |
| @@ -228,6 +228,20 @@ void NetworkConfigurationHandler::GetShillProperties( |
| const network_handler::DictionaryResultCallback& callback, |
| const network_handler::ErrorCallback& error_callback) { |
| NET_LOG(USER) << "GetShillProperties: " << service_path; |
| + |
| + const NetworkState* network_state = |
| + network_state_handler_->GetNetworkState(service_path); |
| + if (network_state && |
|
stevenjb
2017/04/24 21:26:41
As long as we are doing this lookup, we can fail e
Kyle Horimoto
2017/04/25 01:18:32
I don't think this is the right thing to do. I mad
|
| + NetworkTypePattern::Tether().MatchesType(network_state->type())) { |
| + // If this is a Tether network, use the properties present in the |
| + // NetworkState object provided by NetworkStateHandler. Tether networks are |
| + // not present in Shill, so the Shill call below will not work. |
| + base::DictionaryValue dictionary; |
| + network_state->GetStateProperties(&dictionary); |
| + callback.Run(service_path, dictionary); |
| + return; |
| + } |
| + |
| DBusThreadManager::Get()->GetShillServiceClient()->GetProperties( |
| dbus::ObjectPath(service_path), |
| base::Bind(&NetworkConfigurationHandler::GetPropertiesCallback, |