summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/wifi
diff options
context:
space:
mode:
authorSravanthi Palakonda <srapal@codeaurora.org>2015-10-14 18:59:45 +0530
committerAkash Patel <akashp@codeaurora.org>2015-10-21 13:24:15 -0700
commit43d1c45e6a0fc13a53f46e0b187300ae9cb65a90 (patch)
treeeafb2bb8d55166f94e28a844ad164fb96571a99c /src/com/android/settings/wifi
parentf36c88df114d69ddb5143167642af5f5d493257a (diff)
downloadpackages_apps_Settings-43d1c45e6a0fc13a53f46e0b187300ae9cb65a90.zip
packages_apps_Settings-43d1c45e6a0fc13a53f46e0b187300ae9cb65a90.tar.gz
packages_apps_Settings-43d1c45e6a0fc13a53f46e0b187300ae9cb65a90.tar.bz2
Wifi: Handle NullPointerException during AddNetwork for EAP types
While we do AddNetwork for EAP type - SIM/AKA/AKAPRIME ,NullPointerException is observed .Handle this by adding a null check for the Accesspoint object. Change-Id: I6d20eaa5ab734f11bfa5e038d894cb8ead07f204 CRs-Fixed: 923371
Diffstat (limited to 'src/com/android/settings/wifi')
-rw-r--r--src/com/android/settings/wifi/WifiConfigController.java5
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()])