From cdb8463420a62964a38927fd1dee01045a0cb88a Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <rgreenwalt@google.com>
Date: Wed, 19 Mar 2014 14:26:28 -0700
Subject: [PATCH] Catch Netd exceptions to avoid runtime restart

bug:13475636
Change-Id: If36a0051a957fc066711fe8225f8981bc07add04
---
 .../core/java/com/android/server/ConnectivityService.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 68b779c023..ca1c0aee29 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -2434,7 +2434,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
         if (timeout > 0 && iface != null) {
             try {
                 mNetd.addIdleTimer(iface, timeout, type);
-            } catch (RemoteException e) {
+            } catch (Exception e) {
+                // You shall not crash!
+                loge("Exception in setupDataActivityTracking " + e);
             }
         }
     }
@@ -2451,7 +2453,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
             try {
                 // the call fails silently if no idletimer setup for this interface
                 mNetd.removeIdleTimer(iface);
-            } catch (RemoteException e) {
+            } catch (Exception e) {
+                loge("Exception in removeDataActivityTracking " + e);
             }
         }
     }