diff options
author | Chad Brubaker <cbrubaker@google.com> | 2015-05-07 10:29:18 -0700 |
---|---|---|
committer | Chad Brubaker <cbrubaker@google.com> | 2015-05-07 16:14:51 -0700 |
commit | 7236f2abbabefc08e68226677f51fe2117c8c0a5 (patch) | |
tree | 1dc56b657a3ada963bea36d0d0c5a392416c2464 | |
parent | 840002d66c19af51618489850c7ccea465cd23f8 (diff) | |
download | packages_apps_Settings-7236f2abbabefc08e68226677f51fe2117c8c0a5.zip packages_apps_Settings-7236f2abbabefc08e68226677f51fe2117c8c0a5.tar.gz packages_apps_Settings-7236f2abbabefc08e68226677f51fe2117c8c0a5.tar.bz2 |
Track keystore password method changes
Change-Id: I324914c00195d762cbaa8c63084e41fa796b7df8
-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) { |