Merge "wifi: WifiConfigController: fix possible NPE in showSecurityFields" into oc-mr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
8d3bfd62e1
@@ -851,7 +851,7 @@ public class WifiConfigController implements TextWatcher,
|
|||||||
mEapIdentityView = (TextView) mView.findViewById(R.id.identity);
|
mEapIdentityView = (TextView) mView.findViewById(R.id.identity);
|
||||||
mEapAnonymousView = (TextView) mView.findViewById(R.id.anonymous);
|
mEapAnonymousView = (TextView) mView.findViewById(R.id.anonymous);
|
||||||
|
|
||||||
if (mAccessPoint.isCarrierAp()) {
|
if (mAccessPoint != null && mAccessPoint.isCarrierAp()) {
|
||||||
mEapMethodSpinner.setSelection(mAccessPoint.getCarrierApEapType());
|
mEapMethodSpinner.setSelection(mAccessPoint.getCarrierApEapType());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user