Commit c7e0d74b authored by Steven Bennetts's avatar Steven Bennetts Committed by Commit Bot

network_config.mojo: Disclude EthernetEAP in NetworkStateList

Bug: 982206
Change-Id: I0d87e231aa0bea1526286c8907cb40304717a300
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1680106
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: default avatarPavol Marko <pmarko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#675747}
parent c1426c3b
......@@ -349,6 +349,11 @@ void CrosNetworkConfig::GetNetworkState(const std::string& guid,
std::move(callback).Run(nullptr);
return;
}
if (network->type() == shill::kTypeEthernetEap) {
NET_LOG(ERROR) << "EthernetEap not supported for GetNetworkState";
std::move(callback).Run(nullptr);
return;
}
std::move(callback).Run(GetMojoNetworkState(network));
}
......@@ -382,6 +387,11 @@ void CrosNetworkConfig::GetNetworkStateList(
}
std::vector<mojom::NetworkStatePropertiesPtr> result;
for (const NetworkState* network : networks) {
if (network->type() == shill::kTypeEthernetEap) {
// EthernetEap is used by Shill to store EAP properties and does not
// represent a separate network service.
continue;
}
mojom::NetworkStatePropertiesPtr mojo_network =
GetMojoNetworkState(network);
if (mojo_network)
......
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