packages/modules/Wifi
diff --git a/service/ServiceWifiResources/res/values/config.xml b/service/ServiceWifiResources/res/values/config.xml
index a35036e..df4f827 100644
--- a/service/ServiceWifiResources/res/values/config.xml
+++ b/service/ServiceWifiResources/res/values/config.xml
@@ -350,7 +350,7 @@
<string name="config_wifi_tcp_buffers" translatable="false">524288,1048576,2097152,262144,524288,1048576</string>
- <string name="wifi_tether_configure_ssid_default" translatable="false">AndroidAP</string>
+ <string name="wifi_tether_configure_ssid_default" translatable="false">Your Name</string>
<!-- Do not translate. Default access point SSID used for local only hotspot -->
<string name="wifi_localhotspot_configure_ssid_default" translatable="false">AndroidShare</string>
diff --git a/service/java/com/android/server/wifi/WifiApConfigStore.java b/service/java/com/android/server/wifi/WifiApConfigStore.java
index 17ebe5f..bf2bc3b 100644
--- a/service/java/com/android/server/wifi/WifiApConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiApConfigStore.java
@@ -344,7 +344,7 @@ public class WifiApConfigStore {
SoftApConfiguration.Builder configBuilder = new SoftApConfiguration.Builder();
configBuilder.setBand(generateDefaultBand(mContext));
configBuilder.setSsid(mContext.getResources().getString(
- R.string.wifi_tether_configure_ssid_default) + "_" + getRandomIntForDefaultSsid());
+ R.string.wifi_tether_configure_ssid_default));
if (ApConfigUtil.isWpa3SaeSupported(mContext)) {
configBuilder.setPassphrase(generatePassword(),
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION);