commit 512bb7e2e37512e22a466942dc7344dc12439648
author xinhe <xinhe@google.com> Mon May 18 21:22:08 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 18 21:22:09 2015 +0000
tree 06cc79523726a54ed5a46b2506156666ed7a6300
parent 7186a47ef348c17a985eb51ef74469a32c3c938d
parent baf4dab3a8e7e2fdda666d16025abf4694f775c3

Merge "Rename config AP Band for Select AP Band" into mnc-dev

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() {