Merge "wifi: WifiConfigController: fix possible NPE in showSecurityFields" into oc-mr1-dev

am: 8d3bfd62e1

Change-Id: If53c79b20d637623a6d70b1c3bfd7efa788f25f3
This commit is contained in:
Peter Qiu
2017-08-07 20:26:23 +00:00
committed by android-build-merger

View File

@@ -851,7 +851,7 @@ public class WifiConfigController implements TextWatcher,
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());
}