Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd998a0c authored by San Mehat's avatar San Mehat Committed by Android (Google) Code Review
Browse files

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

parents 4b18ced6 f0db6e18

core/java/android/os/INetworkManagementService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -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

services/java/com/android/server/NetworkManagementService.java

+2 −2
Original line number Diff line number Diff line
@@ -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) {