Commit 316f5f8e authored by Azeem Arshad's avatar Azeem Arshad Committed by Commit Bot

[CrOS Cellular] Fix cellular technology icon inconsistency.

This CL fixes issue with cellular technology icon not being consistent
across all UI. This seems to be caused because we do not check for
network technology changes when triggering active network change
notifications. Fixed this by adding check for network technology as
well.

Fixed: 994445
Change-Id: I69a24af8efd6dd2888631811723333cf276465f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1977309Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Azeem Arshad <azeemarshad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726665}
parent 847492ef
...@@ -100,7 +100,8 @@ class NetworkStateHandler::ActiveNetworkState { ...@@ -100,7 +100,8 @@ class NetworkStateHandler::ActiveNetworkState {
connection_state_(network->connection_state()), connection_state_(network->connection_state()),
activation_state_(network->activation_state()), activation_state_(network->activation_state()),
connect_requested_(network->connect_requested()), connect_requested_(network->connect_requested()),
signal_strength_(network->signal_strength()) {} signal_strength_(network->signal_strength()),
network_technology_(network->network_technology()) {}
bool MatchesNetworkState(const NetworkState* network) { bool MatchesNetworkState(const NetworkState* network) {
return guid_ == network->guid() && return guid_ == network->guid() &&
...@@ -108,7 +109,8 @@ class NetworkStateHandler::ActiveNetworkState { ...@@ -108,7 +109,8 @@ class NetworkStateHandler::ActiveNetworkState {
activation_state_ == network->activation_state() && activation_state_ == network->activation_state() &&
connect_requested_ == network->connect_requested() && connect_requested_ == network->connect_requested() &&
(abs(signal_strength_ - network->signal_strength()) < (abs(signal_strength_ - network->signal_strength()) <
kSignalStrengthChangeThreshold); kSignalStrengthChangeThreshold) &&
network_technology_ == network->network_technology();
} }
private: private:
...@@ -124,6 +126,9 @@ class NetworkStateHandler::ActiveNetworkState { ...@@ -124,6 +126,9 @@ class NetworkStateHandler::ActiveNetworkState {
const bool connect_requested_; const bool connect_requested_;
// We care about signal strength changes to active networks. // We care about signal strength changes to active networks.
const int signal_strength_; const int signal_strength_;
// Network technology is indicated in network icons in the UI, so we need to
// track changes to this value.
const std::string network_technology_;
}; };
const char NetworkStateHandler::kDefaultCheckPortalList[] = const char NetworkStateHandler::kDefaultCheckPortalList[] =
......
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