diff options
| author | David Su <dysu@google.com> | 2020-06-01 23:34:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-01 23:34:51 +0000 |
| commit | 19c2da59758216a0467d9484526ee5564f5d34d9 (patch) | |
| tree | ba18abf46be4bc739f5ac334a989f72cc257c4c1 | |
| parent | 51c344c28dcb59a64dfb4027cfbd6d7867c6e419 (diff) | |
| parent | 58850ac6e9a797dd0591b3d03932f297e800ee41 (diff) | |
Merge "WifiConfigManager: dump ConfigurationMap" into rvc-dev am: 263642833d am: 58850ac6e9
Original change: undetermined
Change-Id: I250380214455b95279a947215c6f89a628e61559
| -rw-r--r-- | service/java/com/android/server/wifi/ConfigurationMap.java | 11 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/ConfigurationMap.java b/service/java/com/android/server/wifi/ConfigurationMap.java index a050b9cd8..cce895847 100644 --- a/service/java/com/android/server/wifi/ConfigurationMap.java +++ b/service/java/com/android/server/wifi/ConfigurationMap.java @@ -21,6 +21,8 @@ import android.net.wifi.WifiConfiguration; import android.os.UserHandle; import android.os.UserManager; +import java.io.FileDescriptor; +import java.io.PrintWriter; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; @@ -41,6 +43,15 @@ public class ConfigurationMap { mUserManager = userManager; } + /** Dump internal state for debugging. */ + public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { + pw.println("mPerId=" + mPerID); + pw.println("mPerIDForCurrentUser=" + mPerIDForCurrentUser); + pw.println("mScanResultMatchInfoMapForCurrentUser=" + + mScanResultMatchInfoMapForCurrentUser); + pw.println("mCurrentUserId=" + mCurrentUserId); + } + // RW methods: public WifiConfiguration put(WifiConfiguration config) { final WifiConfiguration current = mPerID.put(config.networkId, config); diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index d607b7893..6b88f7165 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -3229,6 +3229,9 @@ public class WifiConfigManager { pw.println(network); } pw.println("WifiConfigManager - Configured networks End ----"); + pw.println("WifiConfigManager - ConfigurationMap Begin ----"); + mConfiguredNetworks.dump(fd, pw, args); + pw.println("WifiConfigManager - ConfigurationMap End ----"); pw.println("WifiConfigManager - Next network ID to be allocated " + mNextNetworkId); pw.println("WifiConfigManager - Last selected network ID " + mLastSelectedNetworkId); pw.println("WifiConfigManager - PNO scan frequency culling enabled = " |