LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't crash if the interface disappears just after appearing.

Browse Source 
am: f851d0347e

Change-Id: If202c458162b6b89d5bef07a5bdc31a7ffea2d17
This commit is contained in:
Lorenzo Colitti
2017-06-23 06:46:10 +00:00
committed by android-build-merger
parent 00f803738d f851d0347e
commit 74681472c8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
View File

@@ -208,7 +208,7 @@ class EthernetNetworkFactory {
InterfaceConfiguration config = mNMService.getInterfaceConfig(iface); InterfaceConfiguration config = mNMService.getInterfaceConfig(iface);
if (config == null) { if (config == null) {
Log.e(TAG, "Null iterface config for " + iface + ". Bailing out."); Log.e(TAG, "Null interface config for " + iface + ". Bailing out.");
return; return;
} }
@@ -220,7 +220,9 @@ class EthernetNetworkFactory {
Log.e(TAG, "Interface unexpectedly changed from " + iface + " to " + mIface); Log.e(TAG, "Interface unexpectedly changed from " + iface + " to " + mIface);
mNMService.setInterfaceDown(iface); 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); Log.e(TAG, "Error upping interface " + mIface + ": " + e);
} }
} }