diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-02-24 10:54:13 -0800 |
|---|---|---|
| committer | Irfan Sheriff <isheriff@google.com> | 2012-03-01 13:57:23 -0800 |
| commit | d3975a917799b85cacaf382b65c5832813066b51 (patch) | |
| tree | 35f249be09330ebf5222b139bd1c2355823e7e88 /services/java/com/android/server/WifiService.java | |
| parent | 5bb59daf42fb24c1131effd4265c2386304feceb (diff) | |
Fix WifiManager async API
Fix the current asynchronous API to use callback like the way
was done with p2p API.
In the process, fix the use of WPS
Change-Id: Ib6f8714cf51b3525b655948268804e7eaaf17587
Diffstat (limited to 'services/java/com/android/server/WifiService.java')
| -rw-r--r-- | services/java/com/android/server/WifiService.java | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java index f09c43f51a84..6b4c8959e252 100644 --- a/services/java/com/android/server/WifiService.java +++ b/services/java/com/android/server/WifiService.java @@ -263,47 +263,42 @@ public class WifiService extends IWifiManager.Stub { ac.connect(mContext, this, msg.replyTo); break; } - case WifiManager.CMD_ENABLE_TRAFFIC_STATS_POLL: { + case WifiManager.ENABLE_TRAFFIC_STATS_POLL: { mEnableTrafficStatsPoll = (msg.arg1 == 1); mTrafficStatsPollToken++; if (mEnableTrafficStatsPoll) { notifyOnDataActivity(); - sendMessageDelayed(Message.obtain(this, WifiManager.CMD_TRAFFIC_STATS_POLL, + sendMessageDelayed(Message.obtain(this, WifiManager.TRAFFIC_STATS_POLL, mTrafficStatsPollToken, 0), POLL_TRAFFIC_STATS_INTERVAL_MSECS); } break; } - case WifiManager.CMD_TRAFFIC_STATS_POLL: { + case WifiManager.TRAFFIC_STATS_POLL: { if (msg.arg1 == mTrafficStatsPollToken) { notifyOnDataActivity(); - sendMessageDelayed(Message.obtain(this, WifiManager.CMD_TRAFFIC_STATS_POLL, + sendMessageDelayed(Message.obtain(this, WifiManager.TRAFFIC_STATS_POLL, mTrafficStatsPollToken, 0), POLL_TRAFFIC_STATS_INTERVAL_MSECS); } break; } - case WifiManager.CMD_CONNECT_NETWORK: { - if (msg.obj != null) { - mWifiStateMachine.connectNetwork((WifiConfiguration)msg.obj); - } else { - mWifiStateMachine.connectNetwork(msg.arg1); - } + case WifiManager.CONNECT_NETWORK: { + mWifiStateMachine.sendMessage(Message.obtain(msg)); break; } - case WifiManager.CMD_SAVE_NETWORK: { - mWifiStateMachine.saveNetwork((WifiConfiguration)msg.obj); + case WifiManager.SAVE_NETWORK: { + mWifiStateMachine.sendMessage(Message.obtain(msg)); break; } - case WifiManager.CMD_FORGET_NETWORK: { - mWifiStateMachine.forgetNetwork(msg.arg1); + case WifiManager.FORGET_NETWORK: { + mWifiStateMachine.sendMessage(Message.obtain(msg)); break; } - case WifiManager.CMD_START_WPS: { - //replyTo has the original source - mWifiStateMachine.startWps(msg.replyTo, (WpsInfo)msg.obj); + case WifiManager.START_WPS: { + mWifiStateMachine.sendMessage(Message.obtain(msg)); break; } - case WifiManager.CMD_DISABLE_NETWORK: { - mWifiStateMachine.disableNetwork(msg.replyTo, msg.arg1, msg.arg2); + case WifiManager.DISABLE_NETWORK: { + mWifiStateMachine.sendMessage(Message.obtain(msg)); break; } default: { @@ -1594,10 +1589,10 @@ public class WifiService extends IWifiManager.Stub { Message msg; if (mNetworkInfo.getDetailedState() == DetailedState.CONNECTED && !mScreenOff) { msg = Message.obtain(mAsyncServiceHandler, - WifiManager.CMD_ENABLE_TRAFFIC_STATS_POLL, 1, 0); + WifiManager.ENABLE_TRAFFIC_STATS_POLL, 1, 0); } else { msg = Message.obtain(mAsyncServiceHandler, - WifiManager.CMD_ENABLE_TRAFFIC_STATS_POLL, 0, 0); + WifiManager.ENABLE_TRAFFIC_STATS_POLL, 0, 0); } msg.sendToTarget(); } |