Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7236f2ab authored by Chad Brubaker's avatar Chad Brubaker
Browse files

Track keystore password method changes 

Change-Id: I324914c00195d762cbaa8c63084e41fa796b7df8
parent 840002d6

src/com/android/settings/CredentialStorage.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

                }

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

+1 −1
Original line number Diff line number Diff line
@@ -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) {