Merge "Fix system server restart" into jb-dev

isheriff · Android (Google) Code Review · commit 86bb22584fd3 · 2012-08-22T16:12:30.000-07:00
diff --git a/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java b/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java
@@ -881,6 +881,9 @@ private boolean doArpTest(int type) {
             //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;

Original file line number	Diff line number	Diff line change
`@@ -881,6 +881,9 @@ private boolean doArpTest(int type) {`
`881`	`881`	`//test to avoid any wifi connectivity issues`
`882`	`882`	`loge("ARP test initiation failure: " + se);`
`883`	`883`	`success = true;`
	`884`	`+ } catch (IllegalArgumentException e) {`
	`885`	`+ // ArpPeer throws exception for IPv6 address`
	`886`	`+ success = true;`
`884`	`887`	`}`
`885`	`888`
`886`	`889`	`return success;`