diff options
| -rw-r--r-- | core/java/android/os/INetworkManagementService.aidl | 10 | ||||
| -rw-r--r-- | services/java/com/android/server/NetworkManagementService.java | 12 |
2 files changed, 5 insertions, 17 deletions
diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl index da8c5d209824..7f16b4ccd86d 100644 --- a/core/java/android/os/INetworkManagementService.aidl +++ b/core/java/android/os/INetworkManagementService.aidl @@ -191,14 +191,9 @@ interface INetworkManagementService long getInterfaceRxCounter(String iface); /** - * Configures RX bandwidth throttling on an interface + * Configures bandwidth throttling on an interface */ - void setInterfaceRxThrottle(String iface, int kbps); - - /** - * Configures TX bandwidth throttling on an interface - */ - void setInterfaceTxThrottle(String iface, int kbps); + void setInterfaceThrottle(String iface, int maxKbits, int rxKbps, int txKbps); /** * Returns the currently configured RX throttle values @@ -211,4 +206,5 @@ interface INetworkManagementService * for the specified interface */ int getInterfaceTxThrottle(String iface); + } diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java index b7f617598f6b..6d16aed969a1 100644 --- a/services/java/com/android/server/NetworkManagementService.java +++ b/services/java/com/android/server/NetworkManagementService.java @@ -564,19 +564,11 @@ class NetworkManagementService extends INetworkManagementService.Stub { return getInterfaceCounter(iface, false); } - private void setInterfaceThrottle(String iface, boolean rx, int kbps) { + public void setInterfaceThrottle(String iface, int maxKbps, int rxKbps, int txKbps) { mContext.enforceCallingOrSelfPermission( android.Manifest.permission.CHANGE_NETWORK_STATE, "NetworkManagementService"); mConnector.doCommand(String.format( - "interface setthrottle %s %s %d", iface, (rx ? "rx" : "tx"), kbps)); - } - - public void setInterfaceRxThrottle(String iface, int kbps) { - setInterfaceThrottle(iface, true, kbps); - } - - public void setInterfaceTxThrottle(String iface, int kbps) { - setInterfaceThrottle(iface, false, kbps); + "interface setthrottle %s %d %d %d", iface, maxKbps, rxKbps, txKbps)); } private int getInterfaceThrottle(String iface, boolean rx) { |