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

Actually provide useful output in Ethernet service dump.

Browse Source 
Bug: 17133859
Change-Id: Ic8424004e48712e4dd906d5bb6a48ce7d38ff9d8
This commit is contained in:
Lorenzo Colitti
2014-08-19 11:45:46 -07:00
parent c0cfe2ee04
commit 1affc58cb6
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
View File

@@ -45,8 +45,11 @@ import android.os.ServiceManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.net.BaseNetworkObserver; import com.android.server.net.BaseNetworkObserver;
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.net.Inet4Address; import java.net.Inet4Address;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -413,4 +416,21 @@ class EthernetNetworkFactory {
mNetworkCapabilities.setLinkUpstreamBandwidthKbps(100 * 1000); mNetworkCapabilities.setLinkUpstreamBandwidthKbps(100 * 1000);
mNetworkCapabilities.setLinkDownstreamBandwidthKbps(100 * 1000); mNetworkCapabilities.setLinkDownstreamBandwidthKbps(100 * 1000);
} }
synchronized void dump(FileDescriptor fd, IndentingPrintWriter pw, String[] args) {
if (!TextUtils.isEmpty(mIface)) {
pw.println("Tracking interface: " + mIface);
pw.increaseIndent();
pw.println("MAC address: " + mHwAddr);
pw.println("Link state: " + (mLinkUp ? "up" : "down"));
pw.decreaseIndent();
} else {
pw.println("Not tracking any interface");
}
pw.println();
pw.println("NetworkInfo: " + mNetworkInfo);
pw.println("LinkProperties: " + mLinkProperties);
pw.println("NetworkAgent: " + mNetworkAgent);
}
} }

10
service-t/src/com/android/server/ethernet/EthernetServiceImpl.java
View File

@@ -67,7 +67,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
private Handler mHandler; private Handler mHandler;
private NetworkInfo mNetworkInfo; private NetworkInfo mNetworkInfo;
private EthernetNetworkFactory mTracker; private final EthernetNetworkFactory mTracker;
public EthernetServiceImpl(Context context) { public EthernetServiceImpl(Context context) {
mContext = context; mContext = context;
@@ -160,8 +160,14 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
+ ", uid=" + Binder.getCallingUid()); + ", uid=" + Binder.getCallingUid());
return; return;
} }
pw.println("Stored Ethernet configuration: ");
pw.println("Current Ethernet state: ");
pw.increaseIndent();
mTracker.dump(fd, pw, args);
pw.decreaseIndent();
pw.println();
pw.println("Stored Ethernet configuration: ");
pw.increaseIndent(); pw.increaseIndent();
pw.println(mIpConfiguration); pw.println(mIpConfiguration);
pw.decreaseIndent(); pw.decreaseIndent();