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

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

Browse Source
This commit is contained in:
San Mehat
2010-04-07 16:40:49 -07:00
committed by Android Git Automerger
parent 4cdd682c8b 12ebde61a5
commit cf1a7a77f1
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 * 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 * 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); 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( mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.CHANGE_NETWORK_STATE, "NetworkManagementService"); android.Manifest.permission.CHANGE_NETWORK_STATE, "NetworkManagementService");
mConnector.doCommand(String.format( 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) { private int getInterfaceThrottle(String iface, boolean rx) {