diff options
| author | Fang Yunong <yunong@codeaurora.org> | 2015-10-26 17:31:10 +0800 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-08-24 08:08:02 -0600 |
| commit | fc1ddbc39ed400692787b8c7acb3ec28b84677a3 (patch) | |
| tree | f8ef935f197c2149616979a868241cebebeebc51 | |
| parent | 79f17a1fda1d9a28ce1d8519004a18c0bf494040 (diff) | |
| download | android_frameworks_opt_net_wifi-fc1ddbc39ed400692787b8c7acb3ec28b84677a3.tar.gz android_frameworks_opt_net_wifi-fc1ddbc39ed400692787b8c7acb3ec28b84677a3.tar.bz2 android_frameworks_opt_net_wifi-fc1ddbc39ed400692787b8c7acb3ec28b84677a3.zip | |
Regional: Customize default wifi ap configuration.
Customize hotspot pass.
Customize wifi direct name.
Customize WLAN hotspot's default security type.
Change-Id: Ib6f6067130e20cbbe0fc8486e73491d3ba5b6cfe
CRs-Fixed: 1037633
| -rw-r--r-- | service/java/com/android/server/wifi/WifiApConfigStore.java | 18 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java | 5 |
2 files changed, 19 insertions, 4 deletions
diff --git a/service/java/com/android/server/wifi/WifiApConfigStore.java b/service/java/com/android/server/wifi/WifiApConfigStore.java index 57b7dc2da..a0341d748 100644 --- a/service/java/com/android/server/wifi/WifiApConfigStore.java +++ b/service/java/com/android/server/wifi/WifiApConfigStore.java @@ -20,6 +20,10 @@ import android.content.Context; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration.KeyMgmt; import android.os.Environment; +import android.os.Handler; +import android.os.Message; +import android.os.Messenger; +import android.text.TextUtils; import android.util.Log; import com.android.internal.R; @@ -205,10 +209,16 @@ public class WifiApConfigStore { WifiConfiguration config = new WifiConfiguration(); config.SSID = mContext.getResources().getString( R.string.wifi_tether_configure_ssid_default); - 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); + int wifiApSecurityType = mContext.getResources().getInteger( + R.integer.wifi_hotspot_security_type); + config.allowedKeyManagement.set(wifiApSecurityType); + config.preSharedKey = mContext.getResources().getString( + R.string.def_wifi_wifihotspot_pass); + if (TextUtils.isEmpty(config.preSharedKey)) { + 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; } } diff --git a/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java b/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java index 718446815..f51e5b5fa 100644 --- a/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java +++ b/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java @@ -2880,6 +2880,11 @@ public class WifiP2pServiceImpl extends IWifiP2pManager.Stub { String deviceName = Settings.Global.getString(mContext.getContentResolver(), Settings.Global.WIFI_P2P_DEVICE_NAME); if (deviceName == null) { + String wifi_direct_name = mContext.getResources().getString( + R.string.def_wifi_direct_name); + if (!TextUtils.isEmpty(wifi_direct_name)){ + return wifi_direct_name; + } /* We use the 4 digits of the ANDROID_ID to have a friendly * default that has low likelihood of collision with a peer */ String id = Settings.Secure.getString(mContext.getContentResolver(), |