diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-07 07:08:40 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-07 07:08:40 -0700 |
| commit | fbd3f36a4c43a43312bff8e218f405bd33a3664c (patch) | |
| tree | 820b2590c9f53ab922872ccd79d57e5773b5e550 | |
| parent | a3b04ef890cfc964767898a228f2e76cbf7e79ac (diff) | |
| parent | c4a3bf94cc870d940df37756ed2c5ea7067d00da (diff) | |
| download | packages_apps_settings-fbd3f36a4c43a43312bff8e218f405bd33a3664c.zip packages_apps_settings-fbd3f36a4c43a43312bff8e218f405bd33a3664c.tar.gz packages_apps_settings-fbd3f36a4c43a43312bff8e218f405bd33a3664c.tar.bz2 | |
am c4a3bf94: Merge change 6345 into donut
Merge commit 'c4a3bf94cc870d940df37756ed2c5ea7067d00da'
* commit 'c4a3bf94cc870d940df37756ed2c5ea7067d00da':
Add header 'blob://' in front of the cert/key names in wpa_supplicant.conf.
| -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 03c9cb5..3a179a0 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) { |