commit acddf19c29878be42525a0144cf60f94b8982539
author android-build-team Robot <android-build-team-robot@google.com> Fri Jun 23 07:12:40 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jun 23 07:12:40 2017 +0000
tree 658a2f8a9f071a8154007b56291d2f6fe53b3f07
parent a41e3f080eaacd8a50130f6327704c40a29e8453
parent ee47a2bdd372e7ee677f8ceb3d7ed7d993e55d6b

release-request-160c4b31-7fa0-4e2b-aabe-85380836a1ce-for-git_oc-release-4129081 snap-temp-L15300000077039010

Change-Id: I0a415f4ddaf34e718eba581504c27548739e1204

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 7ff3f6c..d6d0def 100644
--- a/java/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/java/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -208,7 +208,7 @@
             InterfaceConfiguration config = mNMService.getInterfaceConfig(iface);
 
             if (config == null) {
-                Log.e(TAG, "Null iterface config for " + iface + ". Bailing out.");
+                Log.e(TAG, "Null interface config for " + iface + ". Bailing out.");
                 return;
             }
 
@@ -220,7 +220,9 @@
                 Log.e(TAG, "Interface unexpectedly changed from " + iface + " to " + mIface);
                 mNMService.setInterfaceDown(iface);
             }
-        } catch (RemoteException e) {
+        } catch (RemoteException | IllegalStateException e) {
+            // Either the system is crashing or the interface has disappeared. Just ignore the
+            // error; we haven't modified any state because we only do that if our calls succeed.
             Log.e(TAG, "Error upping interface " + mIface + ": " + e);
         }
     }