summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-11-14 04:04:12 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-11-14 04:04:12 +0000
commitb05b939d85b47ed8c2b53114f8116699b859df09 (patch)
tree381500d252fdd68884f8f4a7906ee093d7ce323c
parent7cedf5da5331fb08ee306eb19958f397f86e97aa (diff)
parenteabd93d25de5a95d6544822d62af6744176fd5e6 (diff)
downloadandroid_device_generic_goldfish-b05b939d85b47ed8c2b53114f8116699b859df09.tar.gz
android_device_generic_goldfish-b05b939d85b47ed8c2b53114f8116699b859df09.tar.bz2
android_device_generic_goldfish-b05b939d85b47ed8c2b53114f8116699b859df09.zip
Snap for 5130385 from eabd93d25de5a95d6544822d62af6744176fd5e6 to pi-qpr2-release
Change-Id: Ifb221f0cca32d3173f44ad98fcb3be290b40d667
-rw-r--r--network/netmgr/wifi_forwarder.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/network/netmgr/wifi_forwarder.cpp b/network/netmgr/wifi_forwarder.cpp
index 64f5b66..e6997d4 100644
--- a/network/netmgr/wifi_forwarder.cpp
+++ b/network/netmgr/wifi_forwarder.cpp
@@ -185,6 +185,9 @@ Result WifiForwarder::init() {
void WifiForwarder::getPollData(std::vector<pollfd>* fds) const {
+ if (mPipeFd == -1) {
+ return;
+ }
int pcapFd = pcap_get_selectable_fd(mMonitorPcap);
if (pcapFd != -1) {
fds->push_back(pollfd{pcapFd, POLLIN, 0});