am 7639a6ab: Merge "Reset failed decryption count on successful decryptions" into lmp-dev

* commit '7639a6ab60426bbfa57c750c1ff0b4016cad0294':
  Reset failed decryption count on successful decryptions
This commit is contained in:
Paul Lawrence 2014-10-05 23:38:39 +00:00 committed by Android Git Automerger
commit 4465744614

View file

@ -1799,6 +1799,9 @@ static int test_mount_encrypted_fs(struct crypt_mnt_ftr* crypt_ftr,
if (rc == 0) { if (rc == 0) {
crypt_ftr->failed_decrypt_count = 0; crypt_ftr->failed_decrypt_count = 0;
if (orig_failed_decrypt_count != 0) {
put_crypt_ftr_and_key(crypt_ftr);
}
/* Save the name of the crypto block device /* Save the name of the crypto block device
* so we can mount it when restarting the framework. */ * so we can mount it when restarting the framework. */