commit 6c3b678ca263462d613899d6cc91ebbe13c736e4
author Chad Brubaker <cbrubaker@google.com> Thu May 07 10:29:18 2015 -0700
committer Chad Brubaker <cbrubaker@google.com> Mon May 11 11:21:55 2015 -0700
tree d3ff857c0b5c284257211b4b5915649448ca1987
parent a6867f55e5a46eda1013e466a7bb5676fcebe67e

Track keystore password method changes

(cherry-picked from commit 7236f2abbabefc08e68226677f51fe2117c8c0a5)

Change-Id: I324914c00195d762cbaa8c63084e41fa796b7df8

src/com/android/settings/CredentialStorage.java

diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 60803dc..653a7c3 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -451,7 +451,7 @@
                 String password = data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
                 if (!TextUtils.isEmpty(password)) {
                     // success
-                    mKeyStore.password(password);
+                    mKeyStore.unlock(password);
                     // return to onResume
                     return;
                 }

tests/src/com/android/settings/vpn2/CertInstallerHelper.java

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 CertInstallerHelper() {
         mKeyStore.reset();
-        mKeyStore.password(CERT_STORE_PASSWORD);
+        mKeyStore.onUserPasswordChanged(CERT_STORE_PASSWORD);
     }
 
     private void extractCertificate(String certFile, String password) {