summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java4
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