diff options
| author | Mitchell Wills <mwills@google.com> | 2016-09-20 11:03:58 -0700 |
|---|---|---|
| committer | Mitchell Wills <mwills@google.com> | 2016-09-21 11:50:25 -0700 |
| commit | c9c91fd93350151a33d87fca768921520c256256 (patch) | |
| tree | a419b2ccb4c252e1a2fa4960589d99ebaaeae3f1 /service/java/com/android/server/wifi/scanner | |
| parent | 4c3ec2f8d10f56776596a6ea86badbe7c8ba20ed (diff) | |
| download | android_frameworks_opt_net_wifi-c9c91fd93350151a33d87fca768921520c256256.tar.gz android_frameworks_opt_net_wifi-c9c91fd93350151a33d87fca768921520c256256.tar.bz2 android_frameworks_opt_net_wifi-c9c91fd93350151a33d87fca768921520c256256.zip | |
Ignore disconnect messages that don't indicate the channel is dead
Bug: 29368784
Test: mmma frameworks/opt/net/wifi/tests && runtest frameworks-wifi
Change-Id: I5ae3665898565379b101c4ac0c5570c9debb1228
(cherry picked from commit d76a14997a969ea44daa47756dcc8f83aee96935)
(also includes cherry picked from commit ca0add40bb7138b361c8a86e42aa5facc4fa5f2d)
Diffstat (limited to 'service/java/com/android/server/wifi/scanner')
| -rw-r--r-- | service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java index 7de0dc2d3..bded79d11 100644 --- a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java +++ b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java @@ -166,7 +166,9 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { } case AsyncChannel.CMD_CHANNEL_DISCONNECTED: { ExternalClientInfo client = (ExternalClientInfo) mClients.get(msg.replyTo); - if (client != null) { + if (client != null && msg.arg1 != AsyncChannel.STATUS_SEND_UNSUCCESSFUL + && msg.arg1 + != AsyncChannel.STATUS_FULL_CONNECTION_REFUSED_ALREADY_CONNECTED) { localLog("client disconnected: " + client + ", reason: " + msg.arg1); client.cleanup(); } |