From c4d0de0346332a43155580c28097c3bdc9976875 Mon Sep 17 00:00:00 2001 From: Rebecca Silberstein Date: Thu, 5 Jan 2017 13:27:51 -0800 Subject: WifiApConfigStore: randomize default soft ap SSID Add a suffix to the default SSID for SoftAp configurations. This results in the default SSID name (currently AndroidAP) followed by and underscore and four randomized ints. The WifiApConfigStoreTest methods were also updated to reflect this change. Bug: 31076622 Test: manually tested with a newly flashed device Test: frameworks/base/wifi/tests/runtests.sh Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh Change-Id: If3032ff97d76cbd0bf24950aeb01a9d30568496f --- service/java/com/android/server/wifi/WifiApConfigStore.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'service') diff --git a/service/java/com/android/server/wifi/WifiApConfigStore.java b/service/java/com/android/server/wifi/WifiApConfigStore.java index bcd8d03e9..4233f5834 100644 --- a/service/java/com/android/server/wifi/WifiApConfigStore.java +++ b/service/java/com/android/server/wifi/WifiApConfigStore.java @@ -32,6 +32,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; +import java.util.Random; import java.util.UUID; /** @@ -46,6 +47,9 @@ public class WifiApConfigStore { private static final int AP_CONFIG_FILE_VERSION = 2; + private static final int RAND_SSID_INT_MIN = 1000; + private static final int RAND_SSID_INT_MAX = 9999; + private WifiConfiguration mWifiApConfig = null; private ArrayList mAllowed2GChannel = null; @@ -191,11 +195,16 @@ public class WifiApConfigStore { private WifiConfiguration getDefaultApConfiguration() { WifiConfiguration config = new WifiConfiguration(); config.SSID = mContext.getResources().getString( - R.string.wifi_tether_configure_ssid_default); + R.string.wifi_tether_configure_ssid_default) + "_" + getRandomIntForDefaultSsid(); config.allowedKeyManagement.set(KeyMgmt.WPA2_PSK); String randomUUID = UUID.randomUUID().toString(); //first 12 chars from xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx config.preSharedKey = randomUUID.substring(0, 8) + randomUUID.substring(9, 13); return config; } + + private int getRandomIntForDefaultSsid() { + Random random = new Random(); + return random.nextInt((RAND_SSID_INT_MAX - RAND_SSID_INT_MIN) + 1) + RAND_SSID_INT_MIN; + } } -- cgit v1.2.3