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 
If the interface disappears between interfaceAdded() and
setInterfaceUp, we'll crash with an IllegalStateException in
NetworkManagementService#setInterfaceConfig.

Ignore the error instead. This should be safe because we don't
modify any state unless our calls succeed.

Bug: 62870779
Test: builds aosp_bullhead-eng
Change-Id: If8c2375f7fffe25a9fa79dc4f1981c745384a276
This commit is contained in:
Lorenzo Colitti
2017-06-23 01:21:25 +09:00
parent 62d5e744c3
commit 17f4e4a027
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);
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 @@ class EthernetNetworkFactory {
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);
}
}