summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRebecca Silberstein <silberst@google.com>2017-08-15 16:06:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-08-15 16:06:15 +0000
commitcaccae64069f0f95195524ef7dfbd28ab4980ecc (patch)
tree333b08932f51dd1672cb1131393c64ef3620a1b4
parent8f5c6f25e0b8266b3bae3540e854d67442bc60d2 (diff)
parent08966b8e4f4739c634a6bf063e57c60edf062080 (diff)
Merge "WifiApConfigVerificationTest: valid min len ssid" into oc-mr1-dev
-rw-r--r--tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java b/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java
index 02064d87e..a923475f1 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java
@@ -268,7 +268,9 @@ public class WifiApConfigStoreTest {
assertFalse(WifiApConfigStore.validateApWifiConfiguration(config));
// now check a valid SSID with a random length
- config.SSID = generateRandomString(mRandom.nextInt(WifiApConfigStore.SSID_MAX_LEN + 1));
+ int validLength = WifiApConfigStore.SSID_MAX_LEN - WifiApConfigStore.SSID_MIN_LEN;
+ config.SSID = generateRandomString(
+ mRandom.nextInt(validLength) + WifiApConfigStore.SSID_MIN_LEN);
assertTrue(WifiApConfigStore.validateApWifiConfiguration(config));
}