summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSanket Padawe <sanketpadawe@google.com>2015-07-29 17:08:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-29 17:08:45 +0000
commit158fa952187245ce7b8e9b8c71ee8bd3f23a9cb8 (patch)
tree9d29ddc2194d88cd5e635a64f1223ad350ca5878 /src
parent83930bc3ee26001e18a3f708e05c0e967e21e559 (diff)
parentdf9b13af9bff0858c787000f1accee7dd1d2874d (diff)
downloadpackages_apps_Settings-158fa952187245ce7b8e9b8c71ee8bd3f23a9cb8.zip
packages_apps_Settings-158fa952187245ce7b8e9b8c71ee8bd3f23a9cb8.tar.gz
packages_apps_Settings-158fa952187245ce7b8e9b8c71ee8bd3f23a9cb8.tar.bz2
am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit 'df9b13af9bff0858c787000f1accee7dd1d2874d': Check for special char when renaming device for Wi-Fi direct.
Diffstat (limited to 'src')
-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 879ebf8..cd70796 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -193,6 +193,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() {