diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2015-08-24 17:52:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-24 17:52:51 +0000 |
| commit | 3be6d0b44bf1152be0bc11bf6bacf750e1028b49 (patch) | |
| tree | 3cd88e31315517cdcee801af7627a95edc67476e /src/com/android/settings | |
| parent | ffe701dc0e52ee95bf6c54291ed1b574d389019c (diff) | |
| parent | e0ece963c67fd3594d284820718c3f316981ac7f (diff) | |
| download | packages_apps_Settings-3be6d0b44bf1152be0bc11bf6bacf750e1028b49.zip packages_apps_Settings-3be6d0b44bf1152be0bc11bf6bacf750e1028b49.tar.gz packages_apps_Settings-3be6d0b44bf1152be0bc11bf6bacf750e1028b49.tar.bz2 | |
Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
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(); |