Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bfa8d8a authored by Vinit Deshpande's avatar Vinit Deshpande Committed by Android Git Automerger
Browse files

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

* commit '5acb871c':
  wifi: Check for the sizeof ssid to start SoftAP
parents d0c09c48 5acb871c

src/com/android/settings/wifi/WifiApDialog.java

+6 −3
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ import android.widget.CheckBox; 
import android.widget.EditText;

import android.widget.EditText;

import android.widget.Spinner;

import android.widget.Spinner;

import android.widget.TextView;

import android.widget.TextView;

import java.nio.charset.Charset;





import com.android.settings.R;

import com.android.settings.R;
@@ -213,9 +214,11 @@ public class WifiApDialog extends AlertDialog implements View.OnClickListener, 
    }

    }





    private void validate() {

    private void validate() {

        if ((mSsid != null && mSsid.length() == 0) ||

        String mSsidString = mSsid.getText().toString();

                   ((mSecurityTypeIndex == WPA2_INDEX)&&

        if ((mSsid != null && mSsid.length() == 0)

                        mPassword.length() < 8)) {

                || ((mSecurityTypeIndex == WPA2_INDEX) && mPassword.length() < 8)

                || (mSsid != null &&

                Charset.forName("UTF-8").encode(mSsidString).limit() > 32)) {

            getButton(BUTTON_SUBMIT).setEnabled(false);

            getButton(BUTTON_SUBMIT).setEnabled(false);

        } else {

        } else {

            getButton(BUTTON_SUBMIT).setEnabled(true);

            getButton(BUTTON_SUBMIT).setEnabled(true);