LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add networks and requests to CS.dump

Browse Source 
Adds debugging.

Change-Id: I352dfe970c990fd210f3d1598519e321bbdd6ed5
(cherry picked from commit 9bdf6bd99db56c652ba9a62d91f258d11d19ca9f)
This commit is contained in:
Robert Greenwalt
2014-05-13 15:36:27 -07:00
parent be46b75c3b
commit a6d85c8ea1
3 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/NetworkCapabilities.java
View File

@@ -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 + "]";
} }
} }

5
core/java/android/net/NetworkInfo.java
View File

@@ -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();
} }
} }

53
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -2834,44 +2834,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(); pw.increaseIndent();
for (int net : mPriorityList) { for (NetworkAgentInfo nai : mNetworkAgentInfos.values()) {
String pidString = net + ": "; pw.println(nai.toString());
for (Integer pid : mNetRequestersPids[net]) { pw.increaseIndent();
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.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();