diff options
-rw-r--r-- | src/com/android/settings/CredentialStorage.java | 2 | ||||
-rw-r--r-- | tests/src/com/android/settings/vpn2/CertInstallerHelper.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java index 81e0a46..5415ccf 100644 --- a/src/com/android/settings/CredentialStorage.java +++ b/src/com/android/settings/CredentialStorage.java @@ -457,7 +457,7 @@ public final class CredentialStorage extends Activity { String password = data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD); if (!TextUtils.isEmpty(password)) { // success - mKeyStore.password(password); + mKeyStore.unlock(password); // return to onResume return; } diff --git a/tests/src/com/android/settings/vpn2/CertInstallerHelper.java b/tests/src/com/android/settings/vpn2/CertInstallerHelper.java index f95893f..fa2638f 100644 --- a/tests/src/com/android/settings/vpn2/CertInstallerHelper.java +++ b/tests/src/com/android/settings/vpn2/CertInstallerHelper.java @@ -71,7 +71,7 @@ public class CertInstallerHelper { */ public CertInstallerHelper() { mKeyStore.reset(); - mKeyStore.password(CERT_STORE_PASSWORD); + mKeyStore.onUserPasswordChanged(CERT_STORE_PASSWORD); } private void extractCertificate(String certFile, String password) { |