From deb438419868ab014fb870a477ef4c59033c5f53 Mon Sep 17 00:00:00 2001 From: lesl Date: Mon, 28 Sep 2020 20:10:25 +0800 Subject: [PATCH] wifi: Move SAP passphrase ascii encodable check to wifi-service Add new overlay config to allow OEM bypass SAP passphrase ascii encodable check since it depends on HAL and driver. Bug: 168688691 Test: atest FrameworksWifiApiTests Test: Manual test to add non ascii passphrase Change-Id: If573acece96faf59c7804c6178d0f0200164f88e Merged-In: If573acece96faf59c7804c6178d0f0200164f88e --- wifi/java/android/net/wifi/SoftApConfiguration.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/wifi/java/android/net/wifi/SoftApConfiguration.java b/wifi/java/android/net/wifi/SoftApConfiguration.java index d2ff658b59bc6..6086f68f63cf4 100644 --- a/wifi/java/android/net/wifi/SoftApConfiguration.java +++ b/wifi/java/android/net/wifi/SoftApConfiguration.java @@ -32,7 +32,6 @@ import com.android.internal.util.Preconditions; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import java.nio.charset.CharsetEncoder; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; @@ -712,10 +711,6 @@ public final class SoftApConfiguration implements Parcelable { } } else { Preconditions.checkStringNotEmpty(passphrase); - final CharsetEncoder asciiEncoder = StandardCharsets.US_ASCII.newEncoder(); - if (!asciiEncoder.canEncode(passphrase)) { - throw new IllegalArgumentException("passphrase not ASCII encodable"); - } if (securityType == SECURITY_TYPE_WPA2_PSK || securityType == SECURITY_TYPE_WPA3_SAE_TRANSITION) { if (passphrase.length() < PSK_MIN_LEN || passphrase.length() > PSK_MAX_LEN) {