summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSanket Padawe <sanketpadawe@google.com>2015-07-29 16:15:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-29 16:15:17 +0000
commit74d85949507f3d9fdc75ace2acbec1aa7503b034 (patch)
tree080d8117c0b7fdb3ca6b04e621632f9c92797469
parenta6c8a0e66d92bde12ae6f1934f020e7700db05d1 (diff)
parente05f71431548cba1b14807ba7f07a5df89c3f0a4 (diff)
downloadpackages_apps_Settings-74d85949507f3d9fdc75ace2acbec1aa7503b034.zip
packages_apps_Settings-74d85949507f3d9fdc75ace2acbec1aa7503b034.tar.gz
packages_apps_Settings-74d85949507f3d9fdc75ace2acbec1aa7503b034.tar.bz2
am e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit 'e05f71431548cba1b14807ba7f07a5df89c3f0a4': Check for special char when renaming device for Wi-Fi direct.
-rw-r--r--src/com/android/settings/wifi/p2p/WifiP2pSettings.java13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index cd1d721..07d66b0 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -206,6 +206,19 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
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() {