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

Merge "Track keystore password method changes" into mnc-dev

Browse Source
This commit is contained in:
Chad Brubaker
2015-05-08 21:51:03 +00:00
committed by Android (Google) Code Review
parent 173d658bab 7236f2abba
commit 69fb78e27b
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); String password = data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
if (!TextUtils.isEmpty(password)) { if (!TextUtils.isEmpty(password)) {
// success // success
mKeyStore.password(password); mKeyStore.unlock(password);
// return to onResume // return to onResume
return; return;
} }

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

@@ -71,7 +71,7 @@ public class CertInstallerHelper {
*/ */
public CertInstallerHelper() { public CertInstallerHelper() {
mKeyStore.reset(); mKeyStore.reset();
mKeyStore.password(CERT_STORE_PASSWORD); mKeyStore.onUserPasswordChanged(CERT_STORE_PASSWORD);
} }
private void extractCertificate(String certFile, String password) { private void extractCertificate(String certFile, String password) {