PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chia-chi Yeh
2010-02-05 18:18:51 +08:00
parent 7d6bfbfc30
commit af7b2d8a23
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -25,6 +25,7 @@ import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState;
import android.net.wifi.ScanResult; import android.net.wifi.ScanResult;
import android.net.wifi.SupplicantState; import android.net.wifi.SupplicantState;
import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration;
@@ -71,7 +72,7 @@ public class WifiSettings extends PreferenceActivity implements DialogInterface.
private ProgressCategory mAccessPoints; private ProgressCategory mAccessPoints;
private Preference mAddNetwork; private Preference mAddNetwork;
private NetworkInfo.DetailedState mLastState; private DetailedState mLastState;
private WifiInfo mLastInfo; private WifiInfo mLastInfo;
private int mLastPriority; private int mLastPriority;
@@ -426,8 +427,8 @@ public class WifiSettings extends PreferenceActivity implements DialogInterface.
} }
} }
private void updateConnectionState(NetworkInfo.DetailedState state) { private void updateConnectionState(DetailedState state) {
if (state == NetworkInfo.DetailedState.OBTAINING_IPADDR) { if (state == DetailedState.OBTAINING_IPADDR) {
mScanner.pause(); mScanner.pause();
} else { } else {
mScanner.resume(); mScanner.resume();
@@ -442,7 +443,8 @@ public class WifiSettings extends PreferenceActivity implements DialogInterface.
((AccessPoint) mAccessPoints.getPreference(i)).update(mLastInfo, mLastState); ((AccessPoint) mAccessPoints.getPreference(i)).update(mLastInfo, mLastState);
} }
if (mResetNetworks) { if (mResetNetworks && (state == DetailedState.CONNECTED ||
state == DetailedState.DISCONNECTED || state == DetailedState.FAILED)) {
enableNetworks(); enableNetworks();
} }
} }