Merge "Catch Netd exceptions to avoid runtime restart"

This commit is contained in:
Etan Cohen
2014-03-19 21:30:15 +00:00
committed by Android (Google) Code Review

View File

@@ -2434,7 +2434,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (timeout > 0 && iface != null) { if (timeout > 0 && iface != null) {
try { try {
mNetd.addIdleTimer(iface, timeout, type); 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 { try {
// the call fails silently if no idletimer setup for this interface // the call fails silently if no idletimer setup for this interface
mNetd.removeIdleTimer(iface); mNetd.removeIdleTimer(iface);
} catch (RemoteException e) { } catch (Exception e) {
loge("Exception in removeDataActivityTracking " + e);
} }
} }
} }