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

Commit 5ba4d745 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android_ui.lnx.2.1-00029. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1075923   Icec03e4c49638a7f1b645671aa31a96481071686   Wifi: Check mAccessPoint object when adding network for

Change-Id: I7800db4c12599e5cf316d1c8236085599db7bf1b
CRs-Fixed: 1075923
parents ee90cc33 44d4f4a3

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

+4 −1
Original line number Diff line number Diff line
@@ -979,7 +979,10 @@ public class WifiConfigController implements TextWatcher, 
            case WIFI_EAP_METHOD_SIM:

            case WIFI_EAP_METHOD_AKA:

            case WIFI_EAP_METHOD_AKA_PRIME:

                WifiConfiguration config = mAccessPoint.getConfig();

                WifiConfiguration config = null;

                if (mAccessPoint != null) {

                    config = mAccessPoint.getConfig();

                }

                ArrayAdapter<String> eapSimAdapter = new ArrayAdapter<String>(

                         mContext, android.R.layout.simple_spinner_item,

                         mSimDisplayNames.toArray(new String[mSimDisplayNames.size()])