summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2015-09-08 16:21:52 +0900
committerLorenzo Colitti <lorenzo@google.com>2015-09-08 16:21:52 +0900
commit9fc9da2b2d8837165f0fc3819d702959c367299f (patch)
tree94ebf4bc0b237fe778ee008c6b6b22f3d01e207c
parent76502788598a85d24b9ae3e253016a9370c49a42 (diff)
downloadandroid_frameworks_opt_net_ethernet-9fc9da2b2d8837165f0fc3819d702959c367299f.tar.gz
android_frameworks_opt_net_ethernet-9fc9da2b2d8837165f0fc3819d702959c367299f.tar.bz2
android_frameworks_opt_net_ethernet-9fc9da2b2d8837165f0fc3819d702959c367299f.zip
Don't crash on startup if we can't fetch the interface list.
The intent of the code was to catch exceptions, but it wasn't actually doing that because when a netd command fails we get an IllegalStateException, not a RemoteException. Bug: 23581852 Change-Id: I66c7c33bdc7b0d0de4fa5cd92dff054797cf860f
-rw-r--r--java/com/android/server/ethernet/EthernetNetworkFactory.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/com/android/server/ethernet/EthernetNetworkFactory.java b/java/com/android/server/ethernet/EthernetNetworkFactory.java
index 4503197..6074dda 100644
--- a/java/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/java/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -396,7 +396,7 @@ class EthernetNetworkFactory {
}
}
}
- } catch (RemoteException e) {
+ } catch (RemoteException|IllegalStateException e) {
Log.e(TAG, "Could not get list of interfaces " + e);
}
}