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

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

Browse Source 
* commit 'ccdeb428ef541bab1bbc6ee3e33c4fb6ccbec42a':
  Avoid inconsistent state when remove fails.
This commit is contained in:
Jeff Sharkey
2011-11-09 14:36:36 +00:00
committed by Android Git Automerger
parent 0816b0c871 ccdeb428ef
commit 79c4ad17f9
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();
command.append("bandwidth removeiquota ").append(iface);
mActiveQuotaIfaces.remove(iface);
mActiveAlertIfaces.remove(iface);
try {
// TODO: support quota shared across interfaces
mConnector.doCommand(command.toString());
mActiveQuotaIfaces.remove(iface);
mActiveAlertIfaces.remove(iface);
} catch (NativeDaemonConnectorException e) {
// TODO: include current iptables state
throw new IllegalStateException("Error communicating to native daemon", e);
}
}