Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d7e9937 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "wifi: Move SAP passphrase ascii encodable check to wifi-service" into mainline-prod

parents de615155 deb43841

wifi/java/android/net/wifi/SoftApConfiguration.java

+0 −5
Original line number Diff line number Diff line
@@ -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) {