From 6d15b6e87916c7716a250fb210bdbc6a2dc3ab75 Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Thu, 23 Jun 2016 12:07:14 +0100 Subject: hotspot: Add a fallback to model-name for SSID Almost every configuration to overlay the device's AP SSID sets it to the model name. Just use that directly when the other options are empty, instead of copying the same string around. Change-Id: I9f6c8d0f9fe9486ce58347b46ba46f7c230910f2 --- service/java/com/android/server/wifi/WifiApConfigStore.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'service') diff --git a/service/java/com/android/server/wifi/WifiApConfigStore.java b/service/java/com/android/server/wifi/WifiApConfigStore.java index 69d77f5..3fae0d8 100644 --- a/service/java/com/android/server/wifi/WifiApConfigStore.java +++ b/service/java/com/android/server/wifi/WifiApConfigStore.java @@ -19,6 +19,7 @@ package com.android.server.wifi; import android.content.Context; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration.KeyMgmt; +import android.os.Build; import android.os.Environment; import android.os.Handler; import android.os.Message; @@ -241,6 +242,9 @@ class WifiApConfigStore extends StateMachine { if (TextUtils.isEmpty(config.SSID)) { config.SSID = mContext.getString(R.string.wifi_tether_configure_ssid_default); } + if (TextUtils.isEmpty(config.SSID)) { + config.SSID = Build.MODEL; + } boolean set_security_none = mContext.getResources().getBoolean( org.cyanogenmod.platform.internal.R.bool.config_wifiHotspotSecurityNone); -- cgit v1.2.3