diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2016-07-13 15:12:13 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2016-07-13 16:23:01 +0100 |
| commit | cea450efef52ea0554e361272730078a2f7d7b81 (patch) | |
| tree | cdc1a01bb50aa2e1c7ce5e0f54056b795c7717ca | |
| parent | 41ada58f12e770903137746e17cc0fafa2a5d42a (diff) | |
| download | android_frameworks_opt_net_wifi-cea450efef52ea0554e361272730078a2f7d7b81.tar.gz android_frameworks_opt_net_wifi-cea450efef52ea0554e361272730078a2f7d7b81.tar.bz2 android_frameworks_opt_net_wifi-cea450efef52ea0554e361272730078a2f7d7b81.zip | |
p2p: Add a fallback to model-name for wifi direct
Almost every configuration to overlay the device's p2p name sets it
to the model name. Just use that directly when the overlay is the %m
token. (empty overlay still uses the default ANDROID_ID-based ID)
Companion change to I9f6c8d0f9fe9486ce58347b46ba46f7c230910f2
Change-Id: Iaaebe078c3a6834cb2bbf88243debe51b76f7c4e
| -rw-r--r-- | service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java b/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java index ff814cdb9..6a0fab23f 100644 --- a/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java +++ b/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java @@ -48,6 +48,7 @@ import android.net.wifi.p2p.nsd.WifiP2pServiceInfo; import android.net.wifi.p2p.nsd.WifiP2pServiceRequest; import android.net.wifi.p2p.nsd.WifiP2pServiceResponse; import android.os.Binder; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.HandlerThread; @@ -2806,6 +2807,9 @@ public final class WifiP2pServiceImpl extends IWifiP2pManager.Stub { String name = mContext.getResources().getString( org.cyanogenmod.platform.internal.R.string.config_wifiDirectName); if (!TextUtils.isEmpty(name)) { + if (name.equals("%m")) { + return Build.MODEL; + } return name; } /* We use the 4 digits of the ANDROID_ID to have a friendly |