diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 14:48:39 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 14:48:39 +0000 |
| commit | 1475139bf2c2727bc0dde5cf50cfc3d2278f2542 (patch) | |
| tree | 94ebf4bc0b237fe778ee008c6b6b22f3d01e207c | |
| parent | 76502788598a85d24b9ae3e253016a9370c49a42 (diff) | |
| parent | 9fc9da2b2d8837165f0fc3819d702959c367299f (diff) | |
| download | android_frameworks_opt_net_ethernet-1475139bf2c2727bc0dde5cf50cfc3d2278f2542.tar.gz android_frameworks_opt_net_ethernet-1475139bf2c2727bc0dde5cf50cfc3d2278f2542.tar.bz2 android_frameworks_opt_net_ethernet-1475139bf2c2727bc0dde5cf50cfc3d2278f2542.zip | |
Merge tag 'android-6.0.0_r26' into cm-13.0
Android 6.0.0 release 26
| -rw-r--r-- | java/com/android/server/ethernet/EthernetNetworkFactory.java | 2 |
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); } } |