From 1affc58cb6aeda4c566a530b17d47eca1bf68ff7 Mon Sep 17 00:00:00 2001
From: Lorenzo Colitti <lorenzo@google.com>
Date: Tue, 19 Aug 2014 11:45:46 -0700
Subject: [PATCH] Actually provide useful output in Ethernet service dump.

Bug: 17133859
Change-Id: Ic8424004e48712e4dd906d5bb6a48ce7d38ff9d8
---
 .../ethernet/EthernetNetworkFactory.java      | 20 +++++++++++++++++++
 .../server/ethernet/EthernetServiceImpl.java  | 10 ++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
index c65a5b20f5..26e8264a56 100644
--- a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -45,8 +45,11 @@ import android.os.ServiceManager;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.android.internal.util.IndentingPrintWriter;
 import com.android.server.net.BaseNetworkObserver;
 
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
 import java.net.Inet4Address;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -413,4 +416,21 @@ class EthernetNetworkFactory {
         mNetworkCapabilities.setLinkUpstreamBandwidthKbps(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);
+    }
 }
diff --git a/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java b/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java
index 1534aabe3e..42d98f65c8 100644
--- a/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java
+++ b/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java
@@ -67,7 +67,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
 
     private Handler mHandler;
     private NetworkInfo mNetworkInfo;
-    private EthernetNetworkFactory mTracker;
+    private final EthernetNetworkFactory mTracker;
 
     public EthernetServiceImpl(Context context) {
         mContext = context;
@@ -160,8 +160,14 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
                     + ", uid=" + Binder.getCallingUid());
             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.println(mIpConfiguration);
         pw.decreaseIndent();