commit af7b2d8a23d297194365db74518cd67c58b9f48d
author Chia-chi Yeh <chiachi@android.com> Fri Feb 05 18:18:51 2010 +0800
committer Chia-chi Yeh <chiachi@android.com> Fri Feb 05 18:18:51 2010 +0800
tree 4d299e11be71be2e56c9eeb3f4ee2797c98514c4
parent 7d6bfbfc309d9c596fb25429ab89c528660b07f4

WifiSettings: enable all networks only when connected, disconnected, or failed.

src/com/android/settings/wifi/WifiSettings.java

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 5b1ca04..e06dcd4 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -25,6 +25,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.NetworkInfo;
+import android.net.NetworkInfo.DetailedState;
 import android.net.wifi.ScanResult;
 import android.net.wifi.SupplicantState;
 import android.net.wifi.WifiConfiguration;
@@ -71,7 +72,7 @@
     private ProgressCategory mAccessPoints;
     private Preference mAddNetwork;
 
-    private NetworkInfo.DetailedState mLastState;
+    private DetailedState mLastState;
     private WifiInfo mLastInfo;
     private int mLastPriority;
 
@@ -426,8 +427,8 @@
         }
     }
 
-    private void updateConnectionState(NetworkInfo.DetailedState state) {
-        if (state == NetworkInfo.DetailedState.OBTAINING_IPADDR) {
+    private void updateConnectionState(DetailedState state) {
+        if (state == DetailedState.OBTAINING_IPADDR) {
             mScanner.pause();
         } else {
             mScanner.resume();
@@ -442,7 +443,8 @@
             ((AccessPoint) mAccessPoints.getPreference(i)).update(mLastInfo, mLastState);
         }
 
-        if (mResetNetworks) {
+        if (mResetNetworks && (state == DetailedState.CONNECTED ||
+                state == DetailedState.DISCONNECTED || state == DetailedState.FAILED)) {
             enableNetworks();
         }
     }