diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-08-22 16:12:29 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-22 16:12:30 -0700 |
| commit | 86bb22584fd306faedc1b3fb7abd08c59f356417 (patch) | |
| tree | f8f9df4c3ff959ed2102bb7d42458890664ac3b0 /wifi | |
| parent | 645eab640e9c139b7a4e99c6c4d4f3bb2a86f092 (diff) | |
| parent | bf3bf7cb60b90ac623bbe44a6baf8a1d24c9a4d9 (diff) | |
| download | frameworks_base-86bb22584fd306faedc1b3fb7abd08c59f356417.zip frameworks_base-86bb22584fd306faedc1b3fb7abd08c59f356417.tar.gz frameworks_base-86bb22584fd306faedc1b3fb7abd08c59f356417.tar.bz2 | |
Merge "Fix system server restart" into jb-dev
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiWatchdogStateMachine.java | 3 |
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 1a42f93..45efe3e 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 e) { + // ArpPeer throws exception for IPv6 address + success = true; } return success; |