From 5c00d3c07496bf624df9c181597f2be9091d4460 Mon Sep 17 00:00:00 2001 From: Weng Su Date: Fri, 19 Nov 2021 23:03:32 +0800 Subject: [PATCH] SoftAp: Use toString() API in place of toBinaryString for indexes Security option index values are currently converted using toBinaryString() which converts indexes to binary String. Thus index values doesn't match the expected Security config values in SoftApConfiguration. This commit uses toString() API to avoid index mismatch. Bug: 197497991 Test: manual test atest -c WifiTetherSecurityPreferenceControllerTest Change-Id: I43d236d071a8141845f312c63b1a693fde254358 --- .../wifi/tether/WifiTetherSecurityPreferenceController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java index acb82062496..286b023f757 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java @@ -82,7 +82,7 @@ public class WifiTetherSecurityPreferenceController extends WifiTetherBasePrefer if (!mIsWpa3Supported && mSecurityMap.keySet() .removeIf(key -> key > SoftApConfiguration.SECURITY_TYPE_WPA2_PSK)) { preference.setEntries(mSecurityMap.values().stream().toArray(CharSequence[]::new)); - preference.setEntryValues(mSecurityMap.keySet().stream().map(Integer::toBinaryString) + preference.setEntryValues(mSecurityMap.keySet().stream().map(i -> Integer.toString(i)) .toArray(CharSequence[]::new)); }