PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 69fb78e2: Merge "Track keystore password method changes" into mnc-dev

Browse Source 
* commit '69fb78e27b61c91d98a9c90a4680e35e72d0e73c':
  Track keystore password method changes
This commit is contained in:
Chad Brubaker
2015-05-08 22:14:04 +00:00
committed by Android Git Automerger
parent cf2814bec4 69fb78e27b
commit 1cfc32d1a5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/CredentialStorage.java
View File

@@ -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;
}

2
tests/src/com/android/settings/vpn2/CertInstallerHelper.java
View File

@@ -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) {