From d5857291cb442a392f173ae4fca2668855b7ff69 Mon Sep 17 00:00:00 2001 From: Andrii Beregovenko Date: Wed, 8 Aug 2012 18:23:55 +0300 Subject: [PATCH] WifiWatchdog: handle exception from ArpPeer Sometimes IllegalArgumantException can happen in constructor of ArpPeer class when IPv6 address is provided. This causes crash of systemserver. Fixing it by adding appropriate exception handler Change-Id: I4bb7bbca790745a1bf56ece96dd91b84b1f70cad Signed-off-by: Andrii Beregovenko Signed-off-by: Vishal Mahaveer --- wifi/java/android/net/wifi/WifiWatchdogStateMachine.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java b/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java index 1a42f93710870..c6d3eae5ce2f7 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;