drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair

Browse Source
This commit is contained in:
Irfan Sheriff
2010-01-20 13:26:08 -08:00
committed by Android (Google) Code Review
parent 1a337547d5 0fe3f7cbbf
commit 48ef378d01
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/java/com/android/server/WifiService.java
View File

@ -329,6 +329,17 @@ public class WifiService extends IWifiManager.Stub {
return false; return false;
} }
/**
* Multiple calls to unregisterReceiver() cause exception and a system crash.
* This can happen if a supplicant is lost (or firmware crash occurs) and user indicates
* disable wifi at the same time.
* Avoid doing a disable when the current Wifi state is UNKNOWN
* TODO: Handle driver load fail and supplicant lost as seperate states
*/
if (mWifiState == WIFI_STATE_UNKNOWN && !enable) {
return false;
}
setWifiEnabledState(enable ? WIFI_STATE_ENABLING : WIFI_STATE_DISABLING, uid); setWifiEnabledState(enable ? WIFI_STATE_ENABLING : WIFI_STATE_DISABLING, uid);
if (enable) { if (enable) {