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

am 73a8f26a: Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo

Browse Source 
Merge commit '73a8f26aef40184d9d5dfe9dabcfbd345deb6386' into froyo-plus-aosp

* commit '73a8f26aef40184d9d5dfe9dabcfbd345deb6386':
  NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed
This commit is contained in:
San Mehat
2010-04-05 10:41:19 -07:00
committed by Android Git Automerger
parent 11f759cf9a 73a8f26aef
commit 9d782f62de
2 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,14 +191,9 @@ interface INetworkManagementService
long getInterfaceRxCounter(String iface); long getInterfaceRxCounter(String iface);
/** /**
* Configures RX bandwidth throttling on an interface * Configures bandwidth throttling on an interface
*/ */
void setInterfaceRxThrottle(String iface, int kbps); void setInterfaceThrottle(String iface, int maxKbits, int rxKbps, int txKbps);
/**
* Configures TX bandwidth throttling on an interface
*/
void setInterfaceTxThrottle(String iface, int kbps);
/** /**
* Returns the currently configured RX throttle values * Returns the currently configured RX throttle values
@@ -211,4 +206,5 @@ interface INetworkManagementService
* for the specified interface * for the specified interface
*/ */
int getInterfaceTxThrottle(String iface); int getInterfaceTxThrottle(String iface);
} }

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

@@ -564,19 +564,11 @@ class NetworkManagementService extends INetworkManagementService.Stub {
return getInterfaceCounter(iface, false); 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( 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 %s %d", iface, (rx ? "rx" : "tx"), kbps)); "interface setthrottle %s %d %d %d", iface, maxKbps, rxKbps, txKbps));
}
public void setInterfaceRxThrottle(String iface, int kbps) {
setInterfaceThrottle(iface, true, kbps);
}
public void setInterfaceTxThrottle(String iface, int kbps) {
setInterfaceThrottle(iface, false, kbps);
} }
private int getInterfaceThrottle(String iface, boolean rx) { private int getInterfaceThrottle(String iface, boolean rx) {