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

am dd498f90: Merge change 24870 into eclair

Browse Source 
Merge commit 'dd498f901efd7984c38e18b548927c19c2b607f0' into eclair-plus-aosp

* commit 'dd498f901efd7984c38e18b548927c19c2b607f0':
  Transient patch for the WifiConfiguration change.
This commit is contained in:
Chung-yih Wang
2009-09-15 23:40:38 -07:00
committed by Android Git Automerger
parent 7b354367af dd498f901e
commit 7b22c68685
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -504,6 +504,7 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
config.priority = priority; config.priority = priority;
config.hiddenSSID = hiddenSsid; config.hiddenSSID = hiddenSsid;
config.SSID = convertToQuotedString(ssid); config.SSID = convertToQuotedString(ssid);
/*
config.eap = mEap; config.eap = mEap;
if (!TextUtils.isEmpty(mPhase2)) { if (!TextUtils.isEmpty(mPhase2)) {
@@ -547,6 +548,7 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
} else { } else {
config.privateKeyPasswd = null; config.privateKeyPasswd = null;
} }
*/
setupSecurity(config); setupSecurity(config);
} }
@@ -622,7 +624,7 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
config.allowedKeyManagement.set(KeyMgmt.IEEE8021X); config.allowedKeyManagement.set(KeyMgmt.IEEE8021X);
} }
if (!TextUtils.isEmpty(mPassword)) { if (!TextUtils.isEmpty(mPassword)) {
config.password = convertToQuotedString(mPassword); // config.password = convertToQuotedString(mPassword);
} }
} }
} }