PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev

Browse Source 
am: ec3055b9eb

Change-Id: I89755845ae509051e4fc2fcfb8f1dd1ee5ab195c
This commit is contained in:
Arc Wang
2019-09-12 01:14:57 -07:00
committed by android-build-merger
parent a5c810d4a2 ec3055b9eb
commit 40f22313dc
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -987,7 +987,9 @@ public class WifiConfigController implements TextWatcher,
}
mView.findViewById(R.id.eap).setVisibility(View.VISIBLE);
boolean initiateEnterpriseNetworkUi = false;
if (mEapMethodSpinner == null) {
initiateEnterpriseNetworkUi = true;
mEapMethodSpinner = (Spinner) mView.findViewById(R.id.method);
mEapMethodSpinner.setOnItemSelectedListener(this);
mPhase2Spinner = (Spinner) mView.findViewById(R.id.phase2);
@@ -1045,7 +1047,7 @@ public class WifiConfigController implements TextWatcher,
}
// Modifying an existing network
if (mAccessPoint != null && mAccessPoint.isSaved()) {
if (initiateEnterpriseNetworkUi && mAccessPoint != null && mAccessPoint.isSaved()) {
final WifiEnterpriseConfig enterpriseConfig = mAccessPoint.getConfig().enterpriseConfig;
final int eapMethod = enterpriseConfig.getEapMethod();
final int phase2Method = enterpriseConfig.getPhase2Method();