diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-08-01 00:26:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-01 00:26:01 +0000 |
| commit | b74c0b2a27f4d30628fe4482a9de6387c6dbdaca (patch) | |
| tree | 537d650ce0c5a5c7205a0ced60177ba7752978c6 | |
| parent | efaa19d97d4aba1897357971af4c0991af71dbbd (diff) | |
| parent | 48c3656944fa69bda1250adf2a90bb2d5a9e004d (diff) | |
| download | packages_apps_Settings-b74c0b2a27f4d30628fe4482a9de6387c6dbdaca.zip packages_apps_Settings-b74c0b2a27f4d30628fe4482a9de6387c6dbdaca.tar.gz packages_apps_Settings-b74c0b2a27f4d30628fe4482a9de6387c6dbdaca.tar.bz2 | |
Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
| -rw-r--r-- | src/com/android/settings/wifi/WifiApDialog.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/settings/wifi/WifiApDialog.java b/src/com/android/settings/wifi/WifiApDialog.java index b43a7ac..254c386 100644 --- a/src/com/android/settings/wifi/WifiApDialog.java +++ b/src/com/android/settings/wifi/WifiApDialog.java @@ -34,6 +34,7 @@ import android.widget.CheckBox; import android.widget.EditText; import android.widget.Spinner; import android.widget.TextView; +import java.nio.charset.Charset; import com.android.settings.R; @@ -213,9 +214,11 @@ public class WifiApDialog extends AlertDialog implements View.OnClickListener, } private void validate() { - if ((mSsid != null && mSsid.length() == 0) || - ((mSecurityTypeIndex == WPA2_INDEX)&& - mPassword.length() < 8)) { + String mSsidString = mSsid.getText().toString(); + if ((mSsid != null && mSsid.length() == 0) + || ((mSecurityTypeIndex == WPA2_INDEX) && mPassword.length() < 8) + || (mSsid != null && + Charset.forName("UTF-8").encode(mSsidString).limit() > 32)) { getButton(BUTTON_SUBMIT).setEnabled(false); } else { getButton(BUTTON_SUBMIT).setEnabled(true); |