From 3c3f264c7f62fddf96ccacb07bbdb7d2075e3d9d Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Thu, 17 Jan 2019 13:54:07 -0800 Subject: [PATCH] Modify toString for WifiNetworkSpecifier, etc Bug: 119632465 Test: Verified logs manually. Change-Id: I5b8a5b5665313a62606ebc9ca9b2fb14ac37ea33 --- wifi/java/android/net/wifi/WifiNetworkAgentSpecifier.java | 5 +++-- wifi/java/android/net/wifi/WifiNetworkSpecifier.java | 6 +++--- wifi/java/android/net/wifi/WifiNetworkSuggestion.java | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/wifi/java/android/net/wifi/WifiNetworkAgentSpecifier.java b/wifi/java/android/net/wifi/WifiNetworkAgentSpecifier.java index 955e040a46f12..b8175d2338ecd 100644 --- a/wifi/java/android/net/wifi/WifiNetworkAgentSpecifier.java +++ b/wifi/java/android/net/wifi/WifiNetworkAgentSpecifier.java @@ -168,8 +168,9 @@ public final class WifiNetworkAgentSpecifier extends NetworkSpecifier implements @Override public String toString() { StringBuilder sb = new StringBuilder("WifiNetworkAgentSpecifier ["); - sb.append("WifiConfiguration=").append( - mWifiConfiguration == null ? null : mWifiConfiguration.configKey()) + sb.append("WifiConfiguration=") + .append(", SSID=").append(mWifiConfiguration.SSID) + .append(", BSSID=").append(mWifiConfiguration.BSSID) .append(", mOriginalRequestorUid=").append(mOriginalRequestorUid) .append("]"); return sb.toString(); diff --git a/wifi/java/android/net/wifi/WifiNetworkSpecifier.java b/wifi/java/android/net/wifi/WifiNetworkSpecifier.java index 4348399b404b4..6e4eeef4dd558 100644 --- a/wifi/java/android/net/wifi/WifiNetworkSpecifier.java +++ b/wifi/java/android/net/wifi/WifiNetworkSpecifier.java @@ -162,11 +162,11 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc @Override public String toString() { return new StringBuilder() - .append("WifiNetworkSpecifierWifiNetworkSpecifier [") + .append("WifiNetworkSpecifier [") .append(", SSID Match pattern=").append(ssidPatternMatcher) .append(", BSSID Match pattern=").append(bssidPatternMatcher) - .append(", WifiConfiguration=").append( - wifiConfiguration == null ? null : wifiConfiguration.configKey()) + .append(", SSID=").append(wifiConfiguration.SSID) + .append(", BSSID=").append(wifiConfiguration.BSSID) .append(", requestorUid=").append(requestorUid) .append("]") .toString(); diff --git a/wifi/java/android/net/wifi/WifiNetworkSuggestion.java b/wifi/java/android/net/wifi/WifiNetworkSuggestion.java index 760f1e6bc5e2a..3c90eb763e814 100644 --- a/wifi/java/android/net/wifi/WifiNetworkSuggestion.java +++ b/wifi/java/android/net/wifi/WifiNetworkSuggestion.java @@ -130,7 +130,8 @@ public final class WifiNetworkSuggestion implements Parcelable { @Override public String toString() { StringBuilder sb = new StringBuilder("WifiNetworkSuggestion [") - .append(", WifiConfiguration=").append(wifiConfiguration) + .append(", SSID=").append(wifiConfiguration.SSID) + .append(", BSSID=").append(wifiConfiguration.BSSID) .append(", isAppInteractionRequired=").append(isAppInteractionRequired) .append(", isUserInteractionRequired=").append(isUserInteractionRequired) .append(", suggestorUid=").append(suggestorUid)