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

am: d83df9e371

Change-Id: I71253285d1350418a77dd39a94403a18efbb896d
This commit is contained in:
Peter Qiu
2017-08-07 20:52:51 +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());
}