Loading src/com/android/settings/wifi/WifiUtils.java +5 −2 Original line number Diff line number Diff line Loading @@ -26,6 +26,8 @@ import android.net.wifi.WifiConfiguration; import android.provider.Settings; import android.text.TextUtils; import java.nio.charset.StandardCharsets; public class WifiUtils { private static final int SSID_ASCII_MIN_LENGTH = 1; Loading @@ -38,7 +40,7 @@ public class WifiUtils { if (TextUtils.isEmpty(ssid)) { 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) { Loading @@ -59,6 +61,7 @@ public class WifiUtils { /** * This method is a stripped and negated version of WifiConfigStore.canModifyNetwork. * * @param context Context of caller * @param config The WiFi config. * @return true if Settings cannot modify the config due to lockDown. Loading tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java +1 −1 Original line number Diff line number Diff line Loading @@ -29,7 +29,7 @@ public class WifiUtilsTest { @Test public void testSSID() { assertThat(WifiUtils.isSSIDTooLong("123")).isFalse(); assertThat(WifiUtils.isSSIDTooLong("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎")).isTrue(); assertThat(WifiUtils.isSSIDTooLong("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎")).isTrue(); assertThat(WifiUtils.isSSIDTooShort("123")).isFalse(); assertThat(WifiUtils.isSSIDTooShort("")).isTrue(); Loading Loading
src/com/android/settings/wifi/WifiUtils.java +5 −2 Original line number Diff line number Diff line Loading @@ -26,6 +26,8 @@ import android.net.wifi.WifiConfiguration; import android.provider.Settings; import android.text.TextUtils; import java.nio.charset.StandardCharsets; public class WifiUtils { private static final int SSID_ASCII_MIN_LENGTH = 1; Loading @@ -38,7 +40,7 @@ public class WifiUtils { if (TextUtils.isEmpty(ssid)) { 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) { Loading @@ -59,6 +61,7 @@ public class WifiUtils { /** * This method is a stripped and negated version of WifiConfigStore.canModifyNetwork. * * @param context Context of caller * @param config The WiFi config. * @return true if Settings cannot modify the config due to lockDown. Loading
tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java +1 −1 Original line number Diff line number Diff line Loading @@ -29,7 +29,7 @@ public class WifiUtilsTest { @Test public void testSSID() { assertThat(WifiUtils.isSSIDTooLong("123")).isFalse(); assertThat(WifiUtils.isSSIDTooLong("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎")).isTrue(); assertThat(WifiUtils.isSSIDTooLong("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎")).isTrue(); assertThat(WifiUtils.isSSIDTooShort("123")).isFalse(); assertThat(WifiUtils.isSSIDTooShort("")).isTrue(); Loading