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

Commit 9a5b02a8 authored by Erik Kline's avatar Erik Kline
Browse files

Add OffloadHardwareInterface.getForwardedStats() wrapper 

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 29337859
Bug: 32163131

Change-Id: Id831bc99cadbd59d280b026866707dbbe3b0e542
parent d8fdb26e

services/core/java/com/android/server/connectivity/tethering/OffloadHardwareInterface.java

+42 −2
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ import java.util.ArrayList; 
 */

 */

public class OffloadHardwareInterface {

public class OffloadHardwareInterface {

    private static final String TAG = OffloadHardwareInterface.class.getSimpleName();

    private static final String TAG = OffloadHardwareInterface.class.getSimpleName();

    private static final String YIELDS = " -> ";

    // Change this value to control whether tether offload is enabled or

    // Change this value to control whether tether offload is enabled or

    // disabled by default in the absence of an explicit Settings value.

    // disabled by default in the absence of an explicit Settings value.

    // See accompanying unittest to distinguish 0 from non-0 values.

    // See accompanying unittest to distinguish 0 from non-0 values.
@@ -59,6 +60,25 @@ public class OffloadHardwareInterface { 
                                       String dstAddr, int dstPort) {}

                                       String dstAddr, int dstPort) {}

    }

    }





    public static class ForwardedStats {

        public long rxBytes;

        public long txBytes;



        public ForwardedStats() {

            rxBytes = 0;

            txBytes = 0;

        }



        public void add(ForwardedStats other) {

            rxBytes += other.rxBytes;

            txBytes += other.txBytes;

        }



        public String toString() {

            return String.format("rx:%s tx:%s", rxBytes, txBytes);

        }

    }



    public OffloadHardwareInterface(Handler h, SharedLog log) {

    public OffloadHardwareInterface(Handler h, SharedLog log) {

        mHandler = h;

        mHandler = h;

        mLog = log.forSubComponent(TAG);

        mLog = log.forSubComponent(TAG);
@@ -123,6 +143,26 @@ public class OffloadHardwareInterface { 
        mLog.log("stopOffloadControl()");

        mLog.log("stopOffloadControl()");

    }

    }





    public ForwardedStats getForwardedStats(String upstream) {

        final String logmsg = String.format("getForwardedStats(%s)",  upstream);



        final ForwardedStats stats = new ForwardedStats();

        try {

            mOffloadControl.getForwardedStats(

                    upstream,

                    (long rxBytes, long txBytes) -> {

                        stats.rxBytes = (rxBytes > 0) ? rxBytes : 0;

                        stats.txBytes = (txBytes > 0) ? txBytes : 0;

                    });

        } catch (RemoteException e) {

            record(logmsg, e);

            return stats;

        }



        mLog.log(logmsg + YIELDS + stats);

        return stats;

    }



    public boolean setUpstreamParameters(

    public boolean setUpstreamParameters(

            String iface, String v4addr, String v4gateway, ArrayList<String> v6gws) {

            String iface, String v4addr, String v4gateway, ArrayList<String> v6gws) {

        iface = (iface != null) ? iface : NO_INTERFACE_NAME;

        iface = (iface != null) ? iface : NO_INTERFACE_NAME;
@@ -151,11 +191,11 @@ public class OffloadHardwareInterface { 
    }

    }





    private void record(String msg, Throwable t) {

    private void record(String msg, Throwable t) {

        mLog.e(msg + " -> exception: " + t);

        mLog.e(msg + YIELDS + "exception: " + t);

    }

    }





    private void record(String msg, CbResults results) {

    private void record(String msg, CbResults results) {

        final String logmsg = msg + " -> " + results;

        final String logmsg = msg + YIELDS + results;

        if (!results.success) {

        if (!results.success) {

            mLog.e(logmsg);

            mLog.e(logmsg);

        } else {

        } else {