commit 486fc9dca9ab48da0514941e2a20564eb7c7c0ac
author Peter Qiu <zqiu@google.com> Mon Aug 07 10:08:49 2017 -0700
committer Peter Qiu <zqiu@google.com> Mon Aug 07 10:10:15 2017 -0700
tree 1e7f01848bcaf5d69a4f3d4ebac0f120a27e5537
parent f1398725a81a798046687303331c8ec7f4ae3311

wifi: WifiConfigController: fix possible NPE in showSecurityFields

Bug: 64438040
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=WifiConfigControllerTest

Change-Id: I2ddc5c07a3c95cba91cef532dc2c84529146d100

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

diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 1aabe5c..5a3d426 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -851,7 +851,7 @@
             mEapIdentityView = (TextView) mView.findViewById(R.id.identity);
             mEapAnonymousView = (TextView) mView.findViewById(R.id.anonymous);
 
-            if (mAccessPoint.isCarrierAp()) {
+            if (mAccessPoint != null && mAccessPoint.isCarrierAp()) {
                 mEapMethodSpinner.setSelection(mAccessPoint.getCarrierApEapType());
             }