diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-07 07:07:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-07 07:07:17 -0700 |
| commit | c4a3bf94cc870d940df37756ed2c5ea7067d00da (patch) | |
| tree | e6e0cd608d507cb431f82505962ec7719aa26881 /src | |
| parent | 423ab2eb9df5e2866ecb1f5f975f2f7a660d334f (diff) | |
| parent | 242096832b552081dc602fe81d9c0fd0a5103ad2 (diff) | |
| download | packages_apps_settings-c4a3bf94cc870d940df37756ed2c5ea7067d00da.zip packages_apps_settings-c4a3bf94cc870d940df37756ed2c5ea7067d00da.tar.gz packages_apps_settings-c4a3bf94cc870d940df37756ed2c5ea7067d00da.tar.bz2 | |
Merge change 6345 into donut
* changes:
Add header 'blob://' in front of the cert/key names in wpa_supplicant.conf.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/wifi/AccessPointDialog.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/settings/wifi/AccessPointDialog.java b/src/com/android/settings/wifi/AccessPointDialog.java index bf2007a..c9f511b 100644 --- a/src/com/android/settings/wifi/AccessPointDialog.java +++ b/src/com/android/settings/wifi/AccessPointDialog.java @@ -84,6 +84,7 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On AccessPointState.WEP_PASSWORD_HEX }; private static final String NOT_APPLICABLE = "N/A"; + private static final String BLOB_HEADER = "blob://"; // Button positions, default to impossible values private int mConnectButtonPos = Integer.MAX_VALUE; @@ -528,7 +529,8 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On if (passwordIsEmpty && (!mState.hasPassword() || mMode == MODE_RETRY_PASSWORD) && (mState.security != null) && - !mState.security.equals(AccessPointState.OPEN)) { + !mState.security.equals(AccessPointState.OPEN) && + !mState.isEnterprise()) { new AlertDialog.Builder(getContext()) .setTitle(R.string.error_title) .setIcon(android.R.drawable.ic_dialog_alert) @@ -642,12 +644,12 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On value = mCertTool.getUserCertificate(key); if (!TextUtils.isEmpty(value)) { mState.setEnterpriseField(AccessPointState.CLIENT_CERT, - value); + BLOB_HEADER + value); } value = mCertTool.getUserPrivateKey(key); if (!TextUtils.isEmpty(value)) { mState.setEnterpriseField(AccessPointState.PRIVATE_KEY, - value); + BLOB_HEADER + value); } } spinner = mCaCertSpinner; @@ -657,7 +659,7 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On value = mCertTool.getCaCertificate(key); if (!TextUtils.isEmpty(value)) { mState.setEnterpriseField(AccessPointState.CA_CERT, - value); + BLOB_HEADER + value); } } switch (securityType) { |