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

am fd998a0c: Merge "NetworkManagementService: Remove \'maxkbs\' parameter from throttle API" into froyo

Browse Source 
Merge commit 'fd998a0caf8cfcd27d1fe73120fbb897ec74af85' into froyo-plus-aosp

* commit 'fd998a0caf8cfcd27d1fe73120fbb897ec74af85':
  NetworkManagementService: Remove 'maxkbs' parameter from throttle API
This commit is contained in:
San Mehat
2010-04-07 16:32:29 -07:00
committed by Android Git Automerger
parent a137cf2a18 fd998a0caf
commit 692329cf3f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/os/INetworkManagementService.aidl
View File

@@ -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

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

@@ -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) {