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

Actually move to Global settings.

Browse Source 
Also add better ConnectivityService logging.

Bug: 7157464
Change-Id: Ia235a7e62ed809240913c4782920c1410c7d597d
This commit is contained in:
Jeff Sharkey
2012-09-14 13:47:51 -07:00
parent 69fc5f8bd1
commit cf6ffaff69
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/java/com/android/server/ConnectivityService.java
View File

@@ -96,6 +96,7 @@ import com.android.internal.net.VpnConfig;
import com.android.internal.net.VpnProfile; import com.android.internal.net.VpnProfile;
import com.android.internal.telephony.Phone; import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneConstants;
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.am.BatteryStatsService; import com.android.server.am.BatteryStatsService;
import com.android.server.connectivity.Tethering; import com.android.server.connectivity.Tethering;
import com.android.server.connectivity.Vpn; import com.android.server.connectivity.Vpn;
@@ -2593,7 +2594,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
@Override @Override
protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) { protected void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " ");
if (mContext.checkCallingOrSelfPermission( if (mContext.checkCallingOrSelfPermission(
android.Manifest.permission.DUMP) android.Manifest.permission.DUMP)
!= PackageManager.PERMISSION_GRANTED) { != PackageManager.PERMISSION_GRANTED) {
@@ -2602,20 +2604,28 @@ public class ConnectivityService extends IConnectivityManager.Stub {
Binder.getCallingUid()); Binder.getCallingUid());
return; return;
} }
// TODO: add locking to get atomic snapshot
pw.println(); pw.println();
for (NetworkStateTracker nst : mNetTrackers) { for (int i = 0; i < mNetTrackers.length; i++) {
final NetworkStateTracker nst = mNetTrackers[i];
if (nst != null) { if (nst != null) {
pw.println("NetworkStateTracker for " + getNetworkTypeName(i) + ":");
pw.increaseIndent();
if (nst.getNetworkInfo().isConnected()) { if (nst.getNetworkInfo().isConnected()) {
pw.println("Active network: " + nst.getNetworkInfo(). pw.println("Active network: " + nst.getNetworkInfo().
getTypeName()); getTypeName());
} }
pw.println(nst.getNetworkInfo()); pw.println(nst.getNetworkInfo());
pw.println(nst.getLinkProperties());
pw.println(nst); pw.println(nst);
pw.println(); pw.println();
pw.decreaseIndent();
} }
} }
pw.println("Network Requester Pids:"); pw.println("Network Requester Pids:");
pw.increaseIndent();
for (int net : mPriorityList) { for (int net : mPriorityList) {
String pidString = net + ": "; String pidString = net + ": ";
for (Object pid : mNetRequestersPids[net]) { for (Object pid : mNetRequestersPids[net]) {
@@ -2624,12 +2634,15 @@ public class ConnectivityService extends IConnectivityManager.Stub {
pw.println(pidString); pw.println(pidString);
} }
pw.println(); pw.println();
pw.decreaseIndent();
pw.println("FeatureUsers:"); pw.println("FeatureUsers:");
pw.increaseIndent();
for (Object requester : mFeatureUsers) { for (Object requester : mFeatureUsers) {
pw.println(requester.toString()); pw.println(requester.toString());
} }
pw.println(); pw.println();
pw.decreaseIndent();
synchronized (this) { synchronized (this) {
pw.println("NetworkTranstionWakeLock is currently " + pw.println("NetworkTranstionWakeLock is currently " +
@@ -2643,9 +2656,11 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (mInetLog != null) { if (mInetLog != null) {
pw.println(); pw.println();
pw.println("Inet condition reports:"); pw.println("Inet condition reports:");
pw.increaseIndent();
for(int i = 0; i < mInetLog.size(); i++) { for(int i = 0; i < mInetLog.size(); i++) {
pw.println(mInetLog.get(i)); pw.println(mInetLog.get(i));
} }
pw.decreaseIndent();
} }
} }