From 09d5c98ea1465183ed8065771e1a4f34a50f0d75 Mon Sep 17 00:00:00 2001 From: Daisuke Miyakawa Date: Wed, 9 Feb 2011 17:03:07 -0800 Subject: [PATCH] Forget network on back in SetupWizard Bug: 3435571 Change-Id: I13c5024515942948971fbf3bb209360244ee7254 --- .../settings/wifi/WifiSettingsForSetupWizardXL.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java index f62d9d265b4..d5c0b3e5c86 100644 --- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java +++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java @@ -44,6 +44,7 @@ import android.widget.TextView; import java.util.Collection; import java.util.EnumMap; +import java.util.List; /** * WifiSetings Activity specific for SetupWizard with X-Large screen size. @@ -571,6 +572,17 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis // he/she won't be astonished there. This stops once the scan finishes. mProgressBar.setIndeterminate(true); + // Remembered networks may be re-used during SetupWizard, which confuse users. + // We force the module to forget them to reduce UX complexity + final List configs = mWifiManager.getConfiguredNetworks(); + for (WifiConfiguration config : configs) { + if (DEBUG) { + Log.d(TAG, String.format("forgeting Wi-Fi network \"%s\" (id: %d)", + config.SSID, config.networkId)); + } + mWifiManager.forgetNetwork(config.networkId); + } + refreshAccessPoints(true); } else { // During user's Wifi configuration. mWifiSettings.resumeWifiScan();