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

Commit c9c90c77 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Add networks and requests to CS.dump 

Adds debugging.

Change-Id: I352dfe970c990fd210f3d1598519e321bbdd6ed5
(cherry picked from commit 9bdf6bd99db56c652ba9a62d91f258d11d19ca9f)
parent 98e8c26b

core/java/android/net/NetworkCapabilities.java

+1 −1
Original line number Diff line number Diff line
@@ -323,6 +323,6 @@ public final class NetworkCapabilities implements Parcelable { 
        String dnBand = ((mLinkDownBandwidthKbps > 0) ? " LinkDnBandwidth>=" +

                mLinkDownBandwidthKbps + "Kbps" : "");



        return "NetworkCapabilities: [" + transports + capabilities + upBand + dnBand + "]";

        return "[" + transports + capabilities + upBand + dnBand + "]";

    }

}

core/java/android/net/NetworkInfo.java

+3 −2
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ public class NetworkInfo implements Parcelable { 
    @Override

    public String toString() {

        synchronized (this) {

            StringBuilder builder = new StringBuilder("NetworkInfo: ");

            StringBuilder builder = new StringBuilder("[");

            builder.append("type: ").append(getTypeName()).append("[").append(getSubtypeName()).

            append("], state: ").append(mState).append("/").append(mDetailedState).

            append(", reason: ").append(mReason == null ? "(unspecified)" : mReason).
@@ -429,7 +429,8 @@ public class NetworkInfo implements Parcelable { 
            append(", failover: ").append(mIsFailover).

            append(", isAvailable: ").append(mIsAvailable).

            append(", isConnectedToProvisioningNetwork: ").

                    append(mIsConnectedToProvisioningNetwork);

            append(mIsConnectedToProvisioningNetwork).

            append("]");

            return builder.toString();

        }

    }

services/core/java/com/android/server/ConnectivityService.java

+24 −29
Original line number Diff line number Diff line
@@ -2834,44 +2834,39 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
            return;

        }



        // TODO: add locking to get atomic snapshot

        pw.println();

        for (int i = 0; i < mNetTrackers.length; i++) {

            final NetworkStateTracker nst = mNetTrackers[i];

            if (nst != null) {

                pw.println("NetworkStateTracker for " + getNetworkTypeName(i) + ":");

                pw.increaseIndent();

                if (nst.getNetworkInfo().isConnected()) {

                    pw.println("Active network: " + nst.getNetworkInfo().

                            getTypeName());

                }

                pw.println(nst.getNetworkInfo());

                pw.println(nst.getLinkProperties());

                pw.println(nst);

                pw.println();

                pw.decreaseIndent();

            }

        NetworkAgentInfo defaultNai = mNetworkForRequestId.get(mDefaultRequest.requestId);

        pw.print("Active default network: ");

        if (defaultNai == null) {

            pw.println("none");

        } else {

            pw.println(defaultNai.network.netId);

        }



        pw.print("Active default network: "); pw.println(getNetworkTypeName(mActiveDefaultNetwork));

        pw.println();



        pw.println("Network Requester Pids:");

        pw.println("Current Networks:");

        pw.increaseIndent();

        for (NetworkAgentInfo nai : mNetworkAgentInfos.values()) {

            pw.println(nai.toString());

            pw.increaseIndent();

        for (int net : mPriorityList) {

            String pidString = net + ": ";

            for (Integer pid : mNetRequestersPids[net]) {

                pidString = pidString + pid.toString() + ", ";

            pw.println("Requests:");

            pw.increaseIndent();

            for (int i = 0; i < nai.networkRequests.size(); i++) {

                pw.println(nai.networkRequests.valueAt(i).toString());

            }

            pw.println(pidString);

            pw.decreaseIndent();

            pw.println("Lingered:");

            pw.increaseIndent();

            for (NetworkRequest nr : nai.networkLingered) pw.println(nr.toString());

            pw.decreaseIndent();

            pw.decreaseIndent();

        }

        pw.println();

        pw.decreaseIndent();

        pw.println();



        pw.println("FeatureUsers:");

        pw.println("Network Requests:");

        pw.increaseIndent();

        for (Object requester : mFeatureUsers) {

            pw.println(requester.toString());

        for (NetworkRequestInfo nri : mNetworkRequests.values()) {

            pw.println(nri.toString());

        }

        pw.println();

        pw.decreaseIndent();