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

Merge change 6345 into donut

Browse Source 
* changes:
  Add header 'blob://' in front of the cert/key names in wpa_supplicant.conf.
This commit is contained in:
Android (Google) Code Review
2009-07-07 07:07:17 -07:00
parent 423ab2eb9d 242096832b
commit c4a3bf94cc
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/wifi/AccessPointDialog.java
View File

@@ -84,6 +84,7 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
AccessPointState.WEP_PASSWORD_HEX AccessPointState.WEP_PASSWORD_HEX
}; };
private static final String NOT_APPLICABLE = "N/A"; private static final String NOT_APPLICABLE = "N/A";
private static final String BLOB_HEADER = "blob://";
// Button positions, default to impossible values // Button positions, default to impossible values
private int mConnectButtonPos = Integer.MAX_VALUE; private int mConnectButtonPos = Integer.MAX_VALUE;
@@ -528,7 +529,8 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
if (passwordIsEmpty && (!mState.hasPassword() || if (passwordIsEmpty && (!mState.hasPassword() ||
mMode == MODE_RETRY_PASSWORD) && mMode == MODE_RETRY_PASSWORD) &&
(mState.security != null) && (mState.security != null) &&
!mState.security.equals(AccessPointState.OPEN)) { !mState.security.equals(AccessPointState.OPEN) &&
!mState.isEnterprise()) {
new AlertDialog.Builder(getContext()) new AlertDialog.Builder(getContext())
.setTitle(R.string.error_title) .setTitle(R.string.error_title)
.setIcon(android.R.drawable.ic_dialog_alert) .setIcon(android.R.drawable.ic_dialog_alert)
@@ -642,12 +644,12 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
value = mCertTool.getUserCertificate(key); value = mCertTool.getUserCertificate(key);
if (!TextUtils.isEmpty(value)) { if (!TextUtils.isEmpty(value)) {
mState.setEnterpriseField(AccessPointState.CLIENT_CERT, mState.setEnterpriseField(AccessPointState.CLIENT_CERT,
value); BLOB_HEADER + value);
} }
value = mCertTool.getUserPrivateKey(key); value = mCertTool.getUserPrivateKey(key);
if (!TextUtils.isEmpty(value)) { if (!TextUtils.isEmpty(value)) {
mState.setEnterpriseField(AccessPointState.PRIVATE_KEY, mState.setEnterpriseField(AccessPointState.PRIVATE_KEY,
value); BLOB_HEADER + value);
} }
} }
spinner = mCaCertSpinner; spinner = mCaCertSpinner;
@@ -657,7 +659,7 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
value = mCertTool.getCaCertificate(key); value = mCertTool.getCaCertificate(key);
if (!TextUtils.isEmpty(value)) { if (!TextUtils.isEmpty(value)) {
mState.setEnterpriseField(AccessPointState.CA_CERT, mState.setEnterpriseField(AccessPointState.CA_CERT,
value); BLOB_HEADER + value);
} }
} }
switch (securityType) { switch (securityType) {