diff options
| author | thieule@chromium.org <thieule@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 01:00:34 +0000 |
|---|---|---|
| committer | thieule@chromium.org <thieule@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 01:00:34 +0000 |
| commit | 321c469eca891b9a34ebccf0e921d21fcfefee90 (patch) | |
| tree | b618acfae74fceab9e1d9cb47e312495caa366d5 /ash | |
| parent | 2ce7f9af667b87c9712ebdf1d7741a817bf3a168 (diff) | |
| download | chromium_src-321c469eca891b9a34ebccf0e921d21fcfefee90.zip chromium_src-321c469eca891b9a34ebccf0e921d21fcfefee90.tar.gz chromium_src-321c469eca891b9a34ebccf0e921d21fcfefee90.tar.bz2 | |
Enable Verizon OTA activation.
Enables OTA activation using the old Wifi flow except it connects to the cellular network instead of requiring a Wifi connection.
BUG=chromium:384185
TEST=Unit tests, manually activate SIM on CDMA and LTE
Review URL: https://codereview.chromium.org/406473002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288854 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/system/chromeos/network/network_connect.cc | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/ash/system/chromeos/network/network_connect.cc b/ash/system/chromeos/network/network_connect.cc index 8ae61f8..99793f3 100644 --- a/ash/system/chromeos/network/network_connect.cc +++ b/ash/system/chromeos/network/network_connect.cc @@ -340,12 +340,17 @@ void ConnectToNetwork(const std::string& service_path, gfx::NativeWindow parent_window) { NET_LOG_USER("ConnectToNetwork", service_path); const NetworkState* network = GetNetworkState(service_path); - if (network && !network->error().empty() && !network->security().empty()) { - NET_LOG_USER("Configure: " + network->error(), service_path); - // If the network is in an error state, show the configuration UI directly - // to avoid a spurious notification. - HandleUnconfiguredNetwork(service_path, parent_window); - return; + if (network) { + if (!network->error().empty() && !network->security().empty()) { + NET_LOG_USER("Configure: " + network->error(), service_path); + // If the network is in an error state, show the configuration UI directly + // to avoid a spurious notification. + HandleUnconfiguredNetwork(service_path, parent_window); + return; + } else if (network->RequiresActivation()) { + ActivateCellular(service_path); + return; + } } const bool check_error_state = true; CallConnectToNetwork(service_path, check_error_state, parent_window); @@ -442,7 +447,7 @@ void ShowMobileSetup(const std::string& service_path) { return; } if (cellular->activation_state() != shill::kActivationStateActivated && - cellular->activate_over_non_cellular_networks() && + cellular->activation_type() == shill::kActivationTypeNonCellular && !handler->DefaultNetwork()) { message_center::MessageCenter::Get()->AddNotification( message_center::Notification::CreateSystemNotification( |