Print an abbreviated wifi config in dumpsys

Test: adb shell am instrument -w com.android.networkrecommendation.tests/android.support.test.runner.AndroidJUnitRunner

Change-Id: Ibf3e2a2cfea0cf529ba54a7d5b5750dfd28fb21e

1 files changed, 16 insertions, 2 deletions

diff --git a/src/com/android/networkrecommendation/DefaultNetworkRecommendationService.java b/src/com/android/networkrecommendation/DefaultNetworkRecommendationService.java
index 972b35a..9499eb3 100644
--- a/src/com/android/networkrecommendation/DefaultNetworkRecommendationService.java
+++ b/src/com/android/networkrecommendation/DefaultNetworkRecommendationService.java
@@ -227,7 +227,7 @@ public class DefaultNetworkRecommendationService extends Service {
                 mLastRecommended = recommendedConfig;
                 mRecommendationCounter++;
             }
-            if (DEBUG) Log.d(TAG, "Recommending network: " + recommendedConfig);
+            if (DEBUG) Log.d(TAG, "Recommending network: " + configToString(recommendedConfig));
             callback.onResult(new RecommendationResult(recommendedConfig));
         }
 
@@ -286,7 +286,7 @@ public class DefaultNetworkRecommendationService extends Service {
             mStorage.dump(fd, writer, args);
             synchronized (mStatsLock) {
                 writer.println("Recommendation requests: " + mRecommendationCounter);
-                writer.println("Last Recommended: " + mLastRecommended);
+                writer.println("Last Recommended: " + configToString(mLastRecommended));
                 writer.println("Score requests: " + mScoreCounter);
             }
         }
@@ -331,6 +331,20 @@ public class DefaultNetworkRecommendationService extends Service {
             return new ScoredNetwork(networkKey, rssiCurve, meteredHint, attributes);
         }
 
+        /** Print a shorter config string, for dumpsys. */
+        private static String configToString(WifiConfiguration config) {
+            if (config == null) {
+                return null;
+            }
+            StringBuilder sb = new StringBuilder()
+                    .append("ID=").append(config.networkId)
+                    .append(",SSID=").append(config.SSID)
+                    .append(",useExternalScores=" ).append(config.useExternalScores)
+                    .append(",meteredHint=" ).append(config.meteredHint)
+                    .append(",meteredOverride=" ).append(config.meteredOverride);
+            return sb.toString();
+        }
+
         /**
          * Add quotes to ScanResult ssids. WifiConfigurations, WifiKeys and ScoredNetworks have the
          * SSID quoted but scan results don't.