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

Commit d17160ba authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Add code to dump OffloadController state. 

(cherry-picked from commit c2519c5f)

Bug: 29337859
Bug: 32163131
Test: observed output of "adb shell dumpsys connectivity tethering"
Change-Id: Icc5aa605cd64a4a2bb5993941dcc4010cc0b1d8e
Merged-In: Icc5aa605cd64a4a2bb5993941dcc4010cc0b1d8e
parent 4ca0ba8f

services/core/java/com/android/server/connectivity/Tethering.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -1755,6 +1755,11 @@ public class Tethering extends BaseNetworkObserver { 
            pw.decreaseIndent();

            pw.decreaseIndent();

        }

        }





        pw.println("Hardware offload:");

        pw.increaseIndent();

        mOffloadController.dump(pw);

        pw.decreaseIndent();



        pw.println("Log:");

        pw.println("Log:");

        pw.increaseIndent();

        pw.increaseIndent();

        if (argsContain(args, SHORT_ARG)) {

        if (argsContain(args, SHORT_ARG)) {

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

+14 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,8 @@ import android.os.SystemClock; 
import android.provider.Settings;

import android.provider.Settings;

import android.text.TextUtils;

import android.text.TextUtils;





import com.android.internal.util.IndentingPrintWriter;



import java.net.Inet4Address;

import java.net.Inet4Address;

import java.net.Inet6Address;

import java.net.Inet6Address;

import java.net.InetAddress;

import java.net.InetAddress;
@@ -348,4 +350,16 @@ public class OffloadController { 
        for (IpPrefix pfx : prefixSet) localPrefixStrs.add(pfx.toString());

        for (IpPrefix pfx : prefixSet) localPrefixStrs.add(pfx.toString());

        return localPrefixStrs;

        return localPrefixStrs;

    }

    }



    public void dump(IndentingPrintWriter pw) {

        if (isOffloadDisabled()) {

            pw.println("Offload disabled");

            return;

        }

        pw.println("Offload HALs " + (started() ? "started" : "not started"));

        LinkProperties lp = mUpstreamLinkProperties;

        String upstream = (lp != null) ? lp.getInterfaceName() : null;

        pw.println("Current upstream: " + upstream);

        pw.println("Exempt prefixes: " + mLastLocalPrefixStrs);

    }

}
 
}