WifiConnectivityManager: add dump call

Adding a dump call to WifiConnectivityManager (that passes through to
WifiNetworkSelector).  The motivation for this change is to remove
the need to have another class to hold a reference to
WifiNetworkSelector (beyond WifiConnectivityManager) and will allow
the removal of getNetworkSelector from WifiInjector at a later date.

Bug: 33271805
Test: runtests.sh
Test: checked bugreport for NetworkSelector section
Change-Id: I948291a458946ae9d8b7e8fa87cf9936cc913dcf

1 files changed, 12 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/WifiConnectivityManager.java b/service/java/com/android/server/wifi/WifiConnectivityManager.java
index 0576ba566..2f7081dab 100644
--- a/service/java/com/android/server/wifi/WifiConnectivityManager.java
+++ b/service/java/com/android/server/wifi/WifiConnectivityManager.java
@@ -35,6 +35,8 @@ import com.android.internal.R;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.server.wifi.util.ScanResultUtil;
 
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -1041,4 +1043,14 @@ public class WifiConnectivityManager {
     long getLastPeriodicSingleScanTimeStamp() {
         return mLastPeriodicSingleScanTimeStamp;
     }
+
+    /**
+     * Dump the local logs.
+     *
+     * Note: this call temporarily calls in to NetworkSelector to dump the LocalLog.  This should be
+     * refactored to dump from WifiConnectivityManager instead.
+     */
+    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
+        mNetworkSelector.dump(fd, pw, args);
+    }
 }