diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-09-23 15:18:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-23 15:18:37 -0700 |
| commit | c21994bc26df959d1a7161e38b4402b7255ea321 (patch) | |
| tree | a40df63889afe41071a5506f3fef8c341d90e004 /wifi/java | |
| parent | b20d378cec09da18301eb9c33bc88251beb81042 (diff) | |
| parent | 32f04e9009046f72242932bf4e820802148e423a (diff) | |
| download | frameworks_base-c21994bc26df959d1a7161e38b4402b7255ea321.zip frameworks_base-c21994bc26df959d1a7161e38b4402b7255ea321.tar.gz frameworks_base-c21994bc26df959d1a7161e38b4402b7255ea321.tar.bz2 | |
Merge "Fix watchdog to stop ping after wifi disconnects" into ics-factoryrom
Diffstat (limited to 'wifi/java')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiWatchdogStateMachine.java | 7 |
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: |