diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-23 03:17:34 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-23 03:17:34 -0700 |
| commit | 31632b5326af6ebf58e75feae7802cfc5322e856 (patch) | |
| tree | 211749ccc984064d0e4aa87f04b719fdde56274d /src/com | |
| parent | fee6919e152c31f28ae9191963ffb37dbd3ebac8 (diff) | |
| parent | 43d1c45e6a0fc13a53f46e0b187300ae9cb65a90 (diff) | |
| download | packages_apps_Settings-31632b5326af6ebf58e75feae7802cfc5322e856.zip packages_apps_Settings-31632b5326af6ebf58e75feae7802cfc5322e856.tar.gz packages_apps_Settings-31632b5326af6ebf58e75feae7802cfc5322e856.tar.bz2 | |
Merge "Wifi: Handle NullPointerException during AddNetwork for EAP types"
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/wifi/WifiConfigController.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 9ff39bf..c74c56a 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -800,7 +800,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()]) |