diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2015-08-24 17:59:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-24 17:59:07 +0000 |
| commit | 1a9626f056d253aa25fca561010624c463bbf9a9 (patch) | |
| tree | 258afef02a7705033eb9e10c08e94a0aa87492d4 /src/com/android/settings | |
| parent | 9a86c08593d8fd3e5bb4a20f1705c3a803e67a5e (diff) | |
| parent | 3be6d0b44bf1152be0bc11bf6bacf750e1028b49 (diff) | |
| download | packages_apps_Settings-1a9626f056d253aa25fca561010624c463bbf9a9.zip packages_apps_Settings-1a9626f056d253aa25fca561010624c463bbf9a9.tar.gz packages_apps_Settings-1a9626f056d253aa25fca561010624c463bbf9a9.tar.bz2 | |
am 3be6d0b4: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
* commit '3be6d0b44bf1152be0bc11bf6bacf750e1028b49':
Avoid new network to connect by using "Add Network" instead only Save it.
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/wifi/WifiSettings.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 341650c..7eded24 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -839,7 +839,9 @@ public class WifiSettings extends RestrictedSettingsFragment mWifiManager.save(config, mSaveListener); } else { mWifiManager.save(config, mSaveListener); - connect(config); + if (mSelectedAccessPoint != null) { // Not an "Add network" + connect(config); + } } mWifiTracker.resumeScanning(); |