diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-04 23:23:26 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-04 23:23:26 +0000 |
commit | ba36187c9eb335123f98b06ac3f3adc2179bb236 (patch) | |
tree | a77562bb0e8407c5c7b5b2d0101087d4772239e3 | |
parent | af42ba0ef7b06c054c744d94168d005c78cc4112 (diff) | |
parent | 994e671aed1c077b097e84eb3d017b5b1f72ebfc (diff) | |
download | wifi-ba36187c9eb335123f98b06ac3f3adc2179bb236.tar.gz |
Snap for 10068852 from 994e671aed1c077b097e84eb3d017b5b1f72ebfc to udc-release
Change-Id: I141d0c42d8b474f8124693429380897d79a842fe
-rw-r--r-- | libs/WifiTrackerLib/res/values-kn/strings.xml | 2 | ||||
-rw-r--r-- | libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/libs/WifiTrackerLib/res/values-kn/strings.xml b/libs/WifiTrackerLib/res/values-kn/strings.xml index acdc3716f..019f7d624 100644 --- a/libs/WifiTrackerLib/res/values-kn/strings.xml +++ b/libs/WifiTrackerLib/res/values-kn/strings.xml @@ -27,7 +27,7 @@ <string name="wifitrackerlib_wifi_disabled_network_failure" msgid="3046956554224277166">"IP ಕಾನ್ಫಿಗರೇಶನ್ ವೈಫಲ್ಯ"</string> <string name="wifitrackerlib_wifi_disabled_transition_disable_indication" msgid="6416221593061166867">"ಪ್ರಸ್ತುತ ಭದ್ರತಾ ಸೆಟ್ಟಿಂಗ್ಗಳ ಜೊತೆ ಲಭ್ಯವಿಲ್ಲ"</string> <string name="wifitrackerlib_wifi_disabled_generic" msgid="4278806060337007814">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string> - <string name="wifitrackerlib_wifi_ap_unable_to_handle_new_sta" msgid="931922372010639716">"ಪ್ರವೇಶ ಕೇಂದ್ರ ತಾತ್ಕಾಲಿಕವಾಗಿ ಭರ್ತಿಯಾಗಿದೆ"</string> + <string name="wifitrackerlib_wifi_ap_unable_to_handle_new_sta" msgid="931922372010639716">"ಆ್ಯಕ್ಸೆಸ್ ಪಾಯಿಂಟ್ ತಾತ್ಕಾಲಿಕವಾಗಿ ಭರ್ತಿಯಾಗಿದೆ"</string> <string name="wifitrackerlib_wifi_poor_channel_conditions" msgid="26484680900376236">"ತಾತ್ಕಾಲಿಕ ಕಳಪೆ ನೆಟ್ವರ್ಕ್ ಸ್ಥಿತಿಗಳು"</string> <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"ದುರ್ಬಲ ಸಿಗ್ನಲ್. ರೂಟರ್ನ ಹತ್ತಿರ ಹೋಗಿ ಕನೆಕ್ಟ್ ಮಾಡಿ ನೋಡಿ."</string> <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"ನೆಟ್ವರ್ಕ್ ಸಾಮರ್ಥ್ಯದ ಮಿತಿ ಮೀರಿದೆ. ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string> diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java index 2e5c4fc8b..22175cebd 100644 --- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java +++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java @@ -52,6 +52,7 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.Network; import android.net.NetworkCapabilities; +import android.net.wifi.MloLink; import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration.NetworkSelectionStatus; @@ -81,7 +82,6 @@ import org.json.JSONObject; import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -976,8 +976,16 @@ public class StandardWifiEntry extends WifiEntry { if (BuildCompat.isAtLeastT() && wifiStandard == ScanResult.WIFI_STANDARD_11BE) { description.append(",mldMac=").append(scanResult.getApMldMacAddress()); description.append(",linkId=").append(scanResult.getApMloLinkId()); - description.append(",affLinks=").append( - Arrays.toString(scanResult.getAffiliatedMloLinks().toArray())); + description.append(",affLinks="); + StringJoiner affLinks = new StringJoiner(",", "[", "]"); + for (MloLink link : scanResult.getAffiliatedMloLinks()) { + affLinks.add(new StringJoiner(",", "{", "}") + .add("apMacAddr=" + link.getApMacAddress()) + .add("freq=" + ScanResult.convertChannelToFrequencyMhzIfSupported( + link.getChannel(), link.getBand())) + .toString()); + } + description.append(affLinks.toString()); } final int ageSeconds = (int) (nowMs - scanResult.timestamp / 1000) / 1000; description.append(",").append(ageSeconds).append("s"); |