summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorChia-chi Yeh <chiachi@android.com>2009-10-01 19:17:55 +0800
committerChia-chi Yeh <chiachi@android.com>2009-10-01 19:17:55 +0800
commit28f1a0fc5bdaed74eeefdc56399c94e3d5b95d17 (patch)
tree7ee4934bb550ea532b6225c86f23f6582f2350c5 /src/com/android
parentee52bed514cbee1fade95a9f862e238c4975cd8b (diff)
downloadpackages_apps_settings-28f1a0fc5bdaed74eeefdc56399c94e3d5b95d17.zip
packages_apps_settings-28f1a0fc5bdaed74eeefdc56399c94e3d5b95d17.tar.gz
packages_apps_settings-28f1a0fc5bdaed74eeefdc56399c94e3d5b95d17.tar.bz2
WifiSettings: use keystore namespace instead of blobl.
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/settings/wifi/AccessPointDialog.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/settings/wifi/AccessPointDialog.java b/src/com/android/settings/wifi/AccessPointDialog.java
index bb5ee6f..4804d78 100644
--- a/src/com/android/settings/wifi/AccessPointDialog.java
+++ b/src/com/android/settings/wifi/AccessPointDialog.java
@@ -81,7 +81,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://";
+ private static final String KEYSTORE_HEADER = "keystore://";
// Button positions, default to impossible values
private int mConnectButtonPos = Integer.MAX_VALUE;
@@ -641,16 +641,16 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
if (index != (spinner.getCount() - 1)) {
String key = (String) spinner.getSelectedItem();
mState.setEnterpriseField(AccessPointState.CLIENT_CERT,
- BLOB_HEADER + Credentials.USER_CERTIFICATE + key);
+ KEYSTORE_HEADER + Credentials.USER_CERTIFICATE + key);
mState.setEnterpriseField(AccessPointState.PRIVATE_KEY,
- BLOB_HEADER + Credentials.USER_PRIVATE_KEY + key);
+ KEYSTORE_HEADER + Credentials.USER_PRIVATE_KEY + key);
}
spinner = mCaCertSpinner;
index = spinner.getSelectedItemPosition();
if (index != (spinner.getCount() - 1)) {
String key = (String) spinner.getSelectedItem();
mState.setEnterpriseField(AccessPointState.CA_CERT,
- BLOB_HEADER + Credentials.CA_CERTIFICATE + key);
+ KEYSTORE_HEADER + Credentials.CA_CERTIFICATE + key);
}
mState.setSecurity(AccessPointState.EAP);
mState.setEap(mEapSpinner.getSelectedItemPosition());