am b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev

* commit 'b74c0b2a27f4d30628fe4482a9de6387c6dbdaca':
  wifi: Check for the sizeof ssid to start SoftAP
This commit is contained in:
Vinit Deshpande
2015-08-01 00:35:02 +00:00
committed by Android Git Automerger

View File

@@ -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);