diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-10-18 16:16:21 -0700 |
|---|---|---|
| committer | Irfan Sheriff <isheriff@google.com> | 2012-10-18 16:16:21 -0700 |
| commit | 943574a822af6dfa32ad94c9f65caa79c5c6ca02 (patch) | |
| tree | 0837fdfacf242323509df9979282a178e6404bc8 | |
| parent | c4c58b249e02c944f05107398f1d32e3c41e28d1 (diff) | |
| download | hardware_libhardware_legacy-943574a822af6dfa32ad94c9f65caa79c5c6ca02.tar.gz hardware_libhardware_legacy-943574a822af6dfa32ad94c9f65caa79c5c6ca02.tar.bz2 hardware_libhardware_legacy-943574a822af6dfa32ad94c9f65caa79c5c6ca02.zip | |
Fix native crash when driver commands time out
Bug: 7361130
Change-Id: Ia076b4ec84a4a0e05ba9eaa53ed732fa041fca6a
| -rw-r--r-- | wifi/wifi.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/wifi/wifi.c b/wifi/wifi.c index f669693..d62b30f 100644 --- a/wifi/wifi.c +++ b/wifi/wifi.c @@ -728,7 +728,13 @@ int wifi_ctrl_recv(int index, char *reply, size_t *reply_len) if (rfds[0].revents & POLLIN) { return wpa_ctrl_recv(monitor_conn[index], reply, reply_len); } else if (rfds[1].revents & POLLIN) { - wifi_close_sockets(index); + /* Close only the p2p sockets on receive side + * see wifi_close_supplicant_connection() + */ + if (index == SECONDARY) { + ALOGD("close sockets %d", index); + wifi_close_sockets(index); + } } return -2; } |