Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Keep device state always updated" into jb-mr2-dev

Browse Source
This commit is contained in:
Irfan Sheriff
2013-04-23 21:57:53 +00:00
committed by Android (Google) Code Review
parent 22a3344cda e68d858b0f
commit 0aea616acd
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/java/com/android/server/wifi/WifiService.java
View File

@@ -121,8 +121,6 @@ public final class WifiService extends IWifiManager.Stub {
* on this */ * on this */
private WorkSource mScanWorkSource; private WorkSource mScanWorkSource;
private boolean mIsReceiverRegistered = false;
/** /**
* Asynchronous channel to WifiStateMachine * Asynchronous channel to WifiStateMachine
*/ */
@@ -272,6 +270,11 @@ public final class WifiService extends IWifiManager.Stub {
} }
} }
}, new IntentFilter(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)); }, new IntentFilter(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION));
// Adding optimizations of only receiving broadcasts when wifi is enabled
// can result in race conditions when apps toggle wifi in the background
// without active user involvement. Always receive broadcasts.
registerForBroadcasts();
} }
private WifiController mWifiController; private WifiController mWifiController;
@@ -421,17 +424,6 @@ public final class WifiService extends IWifiManager.Stub {
} }
mWifiController.sendMessage(CMD_WIFI_TOGGLED); mWifiController.sendMessage(CMD_WIFI_TOGGLED);
if (enable) {
if (!mIsReceiverRegistered) {
registerForBroadcasts();
mIsReceiverRegistered = true;
}
} else if (mIsReceiverRegistered) {
mContext.unregisterReceiver(mReceiver);
mIsReceiverRegistered = false;
}
return true; return true;
} }