summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Irfan Sheriff <isheriff@android.com> 2012-08-22 11:09:17 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2012-08-22 11:09:17 -0700
commit46b29d8dd558c734f058b3806a0b56a2a23b33fd (patch)
tree1fe7ebc43744ba8df47cb30b1ba11f7248523aca
parentc584a24ba1af0c831adf46fe57b69af396fb925c (diff)
parente5773274d68cf91cb9966f47c54ce69a7a6b03f4 (diff)
am e5773274: Merge "WifiWatchdog: handle exception from ArpPeer"
* commit 'e5773274d68cf91cb9966f47c54ce69a7a6b03f4': WifiWatchdog: handle exception from ArpPeer
-rw-r--r--wifi/java/android/net/wifi/WifiWatchdogStateMachine.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java b/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java
index 1a42f9371087..c6d3eae5ce2f 100644
--- a/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java
@@ -881,6 +881,9 @@ public class WifiWatchdogStateMachine extends StateMachine {
//test to avoid any wifi connectivity issues
loge("ARP test initiation failure: " + se);
success = true;
+ } catch (IllegalArgumentException ae) {
+ log("ARP test initiation failure: " + ae);
+ success = true;
}
return success;