Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid inconsistent state when remove fails." into ics-mr1

Browse Source
This commit is contained in:
Jeff Sharkey
2011-11-08 17:27:03 -08:00
committed by Android (Google) Code Review
parent bc0b010ecc 38ddeaa67e
commit ccdeb428ef
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/NetworkManagementService.java
View File

@@ -1136,12 +1136,14 @@ public class NetworkManagementService extends INetworkManagementService.Stub
final StringBuilder command = new StringBuilder(); final StringBuilder command = new StringBuilder();
command.append("bandwidth removeiquota ").append(iface); command.append("bandwidth removeiquota ").append(iface);
mActiveQuotaIfaces.remove(iface);
mActiveAlertIfaces.remove(iface);
try { try {
// TODO: support quota shared across interfaces // TODO: support quota shared across interfaces
mConnector.doCommand(command.toString()); mConnector.doCommand(command.toString());
mActiveQuotaIfaces.remove(iface);
mActiveAlertIfaces.remove(iface);
} catch (NativeDaemonConnectorException e) { } catch (NativeDaemonConnectorException e) {
// TODO: include current iptables state
throw new IllegalStateException("Error communicating to native daemon", e); throw new IllegalStateException("Error communicating to native daemon", e);
} }
} }