PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check wifi password length by byte, not char.

Browse Source 
Change-Id: Ie6dc441780660c52ff01a2bced79a4e95200d731
Fixes: 79209073
Test: robotest
This commit is contained in:
Fan Zhang
2018-06-08 13:18:07 -07:00
parent 7bc2f98188
commit b6584d0a5a
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/wifi/WifiUtils.java
View File

@@ -26,6 +26,8 @@ import android.net.wifi.WifiConfiguration;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import java.nio.charset.StandardCharsets;
public class WifiUtils { public class WifiUtils {
private static final int SSID_ASCII_MIN_LENGTH = 1; private static final int SSID_ASCII_MIN_LENGTH = 1;
@@ -38,7 +40,7 @@ public class WifiUtils {
if (TextUtils.isEmpty(ssid)) { if (TextUtils.isEmpty(ssid)) {
return false; return false;
} }
return ssid.length() > SSID_ASCII_MAX_LENGTH; return ssid.getBytes(StandardCharsets.UTF_8).length > SSID_ASCII_MAX_LENGTH;
} }
public static boolean isSSIDTooShort(String ssid) { public static boolean isSSIDTooShort(String ssid) {
@@ -59,6 +61,7 @@ public class WifiUtils {
/** /**
* This method is a stripped and negated version of WifiConfigStore.canModifyNetwork. * This method is a stripped and negated version of WifiConfigStore.canModifyNetwork.
*
* @param context Context of caller * @param context Context of caller
* @param config The WiFi config. * @param config The WiFi config.
* @return true if Settings cannot modify the config due to lockDown. * @return true if Settings cannot modify the config due to lockDown.

2
tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
View File

@@ -29,7 +29,7 @@ public class WifiUtilsTest {
@Test @Test
public void testSSID() { public void testSSID() {
assertThat(WifiUtils.isSSIDTooLong("123")).isFalse(); assertThat(WifiUtils.isSSIDTooLong("123")).isFalse();
assertThat(WifiUtils.isSSIDTooLong("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎")).isTrue(); assertThat(WifiUtils.isSSIDTooLong("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎")).isTrue();
assertThat(WifiUtils.isSSIDTooShort("123")).isFalse(); assertThat(WifiUtils.isSSIDTooShort("123")).isFalse();
assertThat(WifiUtils.isSSIDTooShort("")).isTrue(); assertThat(WifiUtils.isSSIDTooShort("")).isTrue();