commit 16a45bafa78f3a2cf2b37879c57441c608b03ab7
author Tom O'Neill <tomo@google.com> Tue May 19 00:44:36 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 19 00:44:36 2015 +0000
tree 497e8474791d4636d7ddc1f1bc9cf9f2b2c9dad3
parent 512bb7e2e37512e22a466942dc7344dc12439648
parent 67dc554030302f0b975939cf62099dbe79af5aac

Merge "LocationSettings javadoc describes what's in the UI" into mnc-dev

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3bea360..80c20dc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1552,7 +1552,7 @@
     <!-- Label for the check box to show password -->
     <string name="wifi_show_password">Show password</string>
     <!-- Label for the RadioGroup to choose wifi ap band -->
-    <string name="wifi_ap_band_config">Config AP Band</string>
+    <string name="wifi_ap_band_config">Select AP Band</string>
     <!-- Label for the radio button to choose wifi ap 2.4 GHz band -->
     <string name="wifi_ap_choose_2G">2.4 GHz Band</string>
     <!-- Label for the radio button to choose wifi ap 5GHz band -->

src/com/android/settings/wifi/p2p/WifiP2pSettings.java

diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 72dca9e..81815ae 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -194,6 +194,19 @@
             public void onClick(DialogInterface dialog, int which) {
                 if (which == DialogInterface.BUTTON_POSITIVE) {
                     if (mWifiP2pManager != null) {
+                        String name = mDeviceNameText.getText().toString();
+                        if (name != null) {
+                            for (int i = 0; i < name.length(); i++) {
+                                char cur = name.charAt(i);
+                                if(!Character.isDigit(cur) && !Character.isLetter(cur)
+                                        && cur != '-' && cur != '_' && cur != ' ') {
+                                    Toast.makeText(getActivity(),
+                                            R.string.wifi_p2p_failed_rename_message,
+                                            Toast.LENGTH_LONG).show();
+                                    return;
+                                }
+                            }
+                        }
                         mWifiP2pManager.setDeviceName(mChannel,
                                 mDeviceNameText.getText().toString(),
                                 new WifiP2pManager.ActionListener() {