summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-09-23 14:48:26 -0700
committerIrfan Sheriff <isheriff@google.com>2011-09-23 14:48:26 -0700
commit32f04e9009046f72242932bf4e820802148e423a (patch)
tree9d7d1a5a227460c32e2a4a0d7ee52db050f83355 /wifi
parent6c03850616a6e87de3e1943e47605cc5ebb20e2b (diff)
downloadframeworks_base-32f04e9009046f72242932bf4e820802148e423a.zip
frameworks_base-32f04e9009046f72242932bf4e820802148e423a.tar.gz
frameworks_base-32f04e9009046f72242932bf4e820802148e423a.tar.bz2
Fix watchdog to stop ping after wifi disconnects
- The pings are delayed async messages that were getting handled after a disconnect as well - Increase poll time to 200 ms, so we block on a receive for 1ms every 200ms for a sent packet Bug: 5361564 Change-Id: I1931a1c4146e78a87407d541d8c3934ff8232604
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/WifiWatchdogStateMachine.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java b/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java
index fe0e850..af8c486 100644
--- a/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java
@@ -589,12 +589,11 @@ public class WifiWatchdogStateMachine extends StateMachine {
updateBssids();
transitionTo(mDnsCheckingState);
mNetEventCounter++;
- return HANDLED;
- case DISCONNECTED:
- case DISCONNECTING:
+ break;
+ default:
mNetEventCounter++;
transitionTo(mNotConnectedState);
- return HANDLED;
+ break;
}
return HANDLED;
case EVENT_WIFI_RADIO_STATE_CHANGE: