diff options
| author | 2010-04-07 15:32:44 -0700 | |
|---|---|---|
| committer | 2010-04-07 15:32:44 -0700 | |
| commit | fd998a0caf8cfcd27d1fe73120fbb897ec74af85 (patch) | |
| tree | cc2da3ba56176873359894ee3d8daeea53a26cdc | |
| parent | 4b18ced6b5409bb9dd4013c06b9562b76a062939 (diff) | |
| parent | f0db6e1853e929ae3b65501c31ee57c4dfbc767c (diff) | |
Merge "NetworkManagementService: Remove 'maxkbs' parameter from throttle API" into froyo
| -rw-r--r-- | core/java/android/os/INetworkManagementService.aidl | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/NetworkManagementService.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl index 7f16b4ccd86d..212c5fb81e53 100644 --- a/core/java/android/os/INetworkManagementService.aidl +++ b/core/java/android/os/INetworkManagementService.aidl @@ -193,7 +193,7 @@ interface INetworkManagementService /** * Configures bandwidth throttling on an interface */ - void setInterfaceThrottle(String iface, int maxKbits, int rxKbps, int txKbps); + void setInterfaceThrottle(String iface, int rxKbps, int txKbps); /** * Returns the currently configured RX throttle values diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java index 6d16aed969a1..552bed4ca4c6 100644 --- a/services/java/com/android/server/NetworkManagementService.java +++ b/services/java/com/android/server/NetworkManagementService.java @@ -564,11 +564,11 @@ class NetworkManagementService extends INetworkManagementService.Stub { return getInterfaceCounter(iface, false); } - public void setInterfaceThrottle(String iface, int maxKbps, int rxKbps, int txKbps) { + public void setInterfaceThrottle(String iface, int rxKbps, int txKbps) { mContext.enforceCallingOrSelfPermission( android.Manifest.permission.CHANGE_NETWORK_STATE, "NetworkManagementService"); mConnector.doCommand(String.format( - "interface setthrottle %s %d %d %d", iface, maxKbps, rxKbps, txKbps)); + "interface setthrottle %s %d %d", iface, rxKbps, txKbps)); } private int getInterfaceThrottle(String iface, boolean rx) { |