commit 9fc9da2b2d8837165f0fc3819d702959c367299f
author Lorenzo Colitti <lorenzo@google.com> Tue Sep 08 16:21:52 2015 +0900
committer Lorenzo Colitti <lorenzo@google.com> Tue Sep 08 16:21:52 2015 +0900
tree 94ebf4bc0b237fe778ee008c6b6b22f3d01e207c
parent 76502788598a85d24b9ae3e253016a9370c49a42

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

java/com/android/server/ethernet/EthernetNetworkFactory.java

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 @@
                     }
                 }
             }
-        } catch (RemoteException e) {
+        } catch (RemoteException|IllegalStateException e) {
             Log.e(TAG, "Could not get list of interfaces " + e);
         }
     }