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

Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE

Browse Source
This commit is contained in:
Irfan Sheriff
2011-06-06 20:31:55 -07:00
committed by Android (Google) Code Review
parent 277bfd7cdd 6da83d5868
commit b400184ad6
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,6 +235,15 @@ public class WifiService extends IWifiManager.Stub {
}
break;
}
case AsyncChannel.CMD_CHANNEL_DISCONNECTED: {
if (msg.arg1 == AsyncChannel.STATUS_SEND_UNSUCCESSFUL) {
Slog.d(TAG, "Send failed, client connection lost");
} else {
Slog.d(TAG, "Client connection lost with reason: " + msg.arg1);
}
mClients.remove((AsyncChannel) msg.obj);
break;
}
case AsyncChannel.CMD_CHANNEL_FULL_CONNECTION: {
AsyncChannel ac = new AsyncChannel();
ac.connect(mContext, this, msg.replyTo);
@ -312,6 +321,13 @@ public class WifiService extends IWifiManager.Stub {
}
break;
}
case AsyncChannel.CMD_CHANNEL_DISCONNECTED: {
Slog.e(TAG, "WifiStateMachine channel lost, msg.arg1 =" + msg.arg1);
mWifiStateMachineChannel = null;
//Re-establish connection to state machine
mWsmChannel.connect(mContext, this, mWifiStateMachine.getHandler());
break;
}
default: {
Slog.d(TAG, "WifiStateMachineHandler.handleMessage ignoring msg=" + msg);
break;
@ -584,7 +600,12 @@ public class WifiService extends IWifiManager.Stub {
*/
public WifiConfiguration getWifiApConfiguration() {
enforceAccessPermission();
return mWifiStateMachine.syncGetWifiApConfiguration(mWifiStateMachineChannel);
if (mWifiStateMachineChannel != null) {
return mWifiStateMachine.syncGetWifiApConfiguration(mWifiStateMachineChannel);
} else {
Slog.e(TAG, "mWifiStateMachineChannel is not initialized");
return null;
}
}
/**