Merge "Make wifi code pass through IpManager dump requests." into nyc-dev

2 files changed, 11 insertions, 5 deletions

diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index 96beb101a..e8761e5c8 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -40,6 +40,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.UserInfo;
 import android.database.ContentObserver;
 import android.net.ConnectivityManager;
+import android.net.ip.IpManager;
 import android.net.DhcpInfo;
 import android.net.DhcpResults;
 import android.net.Network;
@@ -1431,6 +1432,11 @@ public class WifiServiceImpl extends IWifiManager.Stub {
             // WifiMetrics proto bytes were requested. Dump only these.
             mWifiStateMachine.updateWifiMetrics();
             mWifiMetrics.dump(fd, pw, args);
+        } else if (args.length > 0 && IpManager.DUMP_ARG.equals(args[0])) {
+            // IpManager dump was requested. Pass it along and take no further action.
+            String[] ipManagerArgs = new String[args.length - 1];
+            System.arraycopy(args, 1, ipManagerArgs, 0, ipManagerArgs.length);
+            mWifiStateMachine.dumpIpManager(fd, pw, ipManagerArgs);
         } else {
             pw.println("Wi-Fi is " + mWifiStateMachine.syncGetWifiStateByName());
             pw.println("Stay-awake conditions: " +
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 0f8c6f4b7..6a1217e7d 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -2716,13 +2716,13 @@ public class WifiStateMachine extends StateMachine implements WifiNative.PnoEven
         }
     }
 
+    public void dumpIpManager(FileDescriptor fd, PrintWriter pw, String[] args) {
+        mIpManager.dump(fd, pw, args);
+    }
+
     @Override
     public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
         super.dump(fd, pw, args);
-        if (args.length == 1 && "apf".equals(args[0])) {
-            mIpManager.dumpApf(pw);
-            return;
-        }
         mSupplicantStateTracker.dump(fd, pw, args);
         pw.println("mLinkProperties " + mLinkProperties);
         pw.println("mWifiInfo " + mWifiInfo);
@@ -2774,7 +2774,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.PnoEven
         mWifiLogger.captureBugReportData(WifiLogger.REPORT_REASON_USER_ACTION);
         mWifiLogger.dump(fd, pw, args);
         mWifiQualifiedNetworkSelector.dump(fd, pw, args);
-        mIpManager.dumpApf(pw);
+        dumpIpManager(fd, pw, args);
     }
 
     public void handleUserSwitch(int userId) {