diff options
| author | chocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 20:10:04 +0000 |
|---|---|---|
| committer | chocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 20:10:04 +0000 |
| commit | cb0658b95fe6fecc62381af0b9083c223070faa8 (patch) | |
| tree | 98ab5136d517157e9b729166a2c7566d02c21107 | |
| parent | 30d612888455af9b836b9bd3b80fc10c25d2b596 (diff) | |
| download | chromium_src-cb0658b95fe6fecc62381af0b9083c223070faa8.zip chromium_src-cb0658b95fe6fecc62381af0b9083c223070faa8.tar.gz chromium_src-cb0658b95fe6fecc62381af0b9083c223070faa8.tar.bz2 | |
Merge 64461 - For add network, if password is empty, we search for a hidden network with no security.
BUG=chromium-os:8193
TEST=manual
Review URL: http://codereview.chromium.org/4142012
TBR=chocobo@chromium.org
Review URL: http://codereview.chromium.org/4089012
git-svn-id: svn://svn.chromium.org/chrome/branches/552/src@64474 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/cros/network_library.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index 162d9d3..f1541e8 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -715,8 +715,9 @@ class NetworkLibraryImpl : public NetworkLibrary { return; // First create a service from hidden network. - ServiceInfo* service = GetWifiService(ssid.c_str(), - SECURITY_UNKNOWN); + ConnectionSecurity security = password.empty() ? + SECURITY_NONE : SECURITY_UNKNOWN; + ServiceInfo* service = GetWifiService(ssid.c_str(), security); if (service) { // Set auto-connect. SetAutoConnect(service->service_path, auto_connect); |