Merge "Add networks and requests to CS.dump" (54b6fd0c) · Commits · e / os / android_frameworks_base

core/java/android/net/NetworkCapabilities.java

+1 −1

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

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

core/java/android/net/NetworkInfo.java

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -420,7 +420,7 @@ public class NetworkInfo implements Parcelable {
	@Override		@Override
	public String toString() {		public String toString() {
	synchronized (this) {		synchronized (this) {
	StringBuilder builder = new StringBuilder("NetworkInfo: ");		StringBuilder builder = new StringBuilder("[");
	builder.append("type: ").append(getTypeName()).append("[").append(getSubtypeName()).		builder.append("type: ").append(getTypeName()).append("[").append(getSubtypeName()).
	append("], state: ").append(mState).append("/").append(mDetailedState).		append("], state: ").append(mState).append("/").append(mDetailedState).
	append(", reason: ").append(mReason == null ? "(unspecified)" : mReason).		append(", reason: ").append(mReason == null ? "(unspecified)" : mReason).
	@@ -429,7 +429,8 @@ public class NetworkInfo implements Parcelable {
	append(", failover: ").append(mIsFailover).		append(", failover: ").append(mIsFailover).
	append(", isAvailable: ").append(mIsAvailable).		append(", isAvailable: ").append(mIsAvailable).
	append(", isConnectedToProvisioningNetwork: ").		append(", isConnectedToProvisioningNetwork: ").
	append(mIsConnectedToProvisioningNetwork);		append(mIsConnectedToProvisioningNetwork).
			append("]");
	return builder.toString();		return builder.toString();
	}		}
	}		}

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

+24 −29

Original line number	Original line	Diff line number	Diff line
	@@ -2878,44 +2878,39 @@ public class ConnectivityService extends IConnectivityManager.Stub {
	return;		return;
	}		}

	// TODO: add locking to get atomic snapshot		NetworkAgentInfo defaultNai = mNetworkForRequestId.get(mDefaultRequest.requestId);
	pw.println();		pw.print("Active default network: ");
	for (int i = 0; i < mNetTrackers.length; i++) {		if (defaultNai == null) {
	final NetworkStateTracker nst = mNetTrackers[i];		pw.println("none");
	if (nst != null) {		} else {
	pw.println("NetworkStateTracker for " + getNetworkTypeName(i) + ":");		pw.println(defaultNai.network.netId);
	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();
	}
	}		}

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

	pw.println("Network Requester Pids:");		pw.println("Current Networks:");
			pw.increaseIndent();
			for (NetworkAgentInfo nai : mNetworkAgentInfos.values()) {
			pw.println(nai.toString());
	pw.increaseIndent();		pw.increaseIndent();
	for (int net : mPriorityList) {		pw.println("Requests:");
	String pidString = net + ": ";		pw.increaseIndent();
	for (Integer pid : mNetRequestersPids[net]) {		for (int i = 0; i < nai.networkRequests.size(); i++) {
	pidString = pidString + pid.toString() + ", ";		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.decreaseIndent();
			pw.println();

	pw.println("FeatureUsers:");		pw.println("Network Requests:");
	pw.increaseIndent();		pw.increaseIndent();
	for (Object requester : mFeatureUsers) {		for (NetworkRequestInfo nri : mNetworkRequests.values()) {
	pw.println(requester.toString());		pw.println(nri.toString());
	}		}
	pw.println();		pw.println();
	pw.decreaseIndent();		pw.decreaseIndent();