Track keystore password method changes
Change-Id: I324914c00195d762cbaa8c63084e41fa796b7df8
diff --git a/support/src/com/android/keychain/tests/support/IKeyChainServiceTestSupport.aidl b/support/src/com/android/keychain/tests/support/IKeyChainServiceTestSupport.aidl
index 0921f2e..4964a96 100644
--- a/support/src/com/android/keychain/tests/support/IKeyChainServiceTestSupport.aidl
+++ b/support/src/com/android/keychain/tests/support/IKeyChainServiceTestSupport.aidl
@@ -31,7 +31,7 @@
*/
interface IKeyChainServiceTestSupport {
boolean keystoreReset();
- boolean keystorePassword(String password);
+ boolean keystoreSetPassword(String password);
boolean keystorePut(String key, in byte[] value);
boolean keystoreImportKey(String key, in byte[] value);
void revokeAppPermission(int uid, String alias);
diff --git a/support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java b/support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java
index 1d429f8..c8024bd 100644
--- a/support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java
+++ b/support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java
@@ -35,9 +35,9 @@
Log.d(TAG, "keystoreReset");
return mKeyStore.reset();
}
- @Override public boolean keystorePassword(String password) {
- Log.d(TAG, "keystorePassword");
- return mKeyStore.password(password);
+ @Override public boolean keystoreSetPassword(String password) {
+ Log.d(TAG, "keystoreSetPassword");
+ return mKeyStore.onUserPasswordChanged(password);
}
@Override public boolean keystorePut(String key, byte[] value) {
Log.d(TAG, "keystorePut");
diff --git a/tests/src/com/android/keychain/tests/KeyChainServiceTest.java b/tests/src/com/android/keychain/tests/KeyChainServiceTest.java
index e8236aa..1f3f7de 100644
--- a/tests/src/com/android/keychain/tests/KeyChainServiceTest.java
+++ b/tests/src/com/android/keychain/tests/KeyChainServiceTest.java
@@ -145,7 +145,7 @@
Log.d(TAG, "test_KeyChainService setup keystore");
KeyStore keyStore = KeyStore.getInstance();
assertTrue(mSupport.keystoreReset());
- assertTrue(mSupport.keystorePassword("newpasswd"));
+ assertTrue(mSupport.keystoreSetPassword("newpasswd"));
String intermediate = "-intermediate";
String root = "-root";