| commit | 3ae9de9fe3937ae55b2ae069fd97bc0f3d55783d | [log] [tgz] |
|---|---|---|
| author | Shaquille Johnson <ssjohnson@google.com> | Thu Feb 29 15:52:55 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 29 15:52:55 2024 +0000 |
| tree | 21eaeda9c02a938a1228b3b6fc1bada89b020e5c | |
| parent | 85afec8c3235468b2d5f0b734221abc3a7c7d324 [diff] | |
| parent | 972ca7c73e8f9a1c32ab5f508dcde438fec89f46 [diff] |
Merge "Change the log level from error to warn" into main am: a83982159f am: 972ca7c73e Original change: https://android-review.googlesource.com/c/platform/system/security/+/2972492 Change-Id: Ia7e0d8ddfc436a2ffca4d33cdb2ac1706f9aec52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/keystore2/src/operation.rs b/keystore2/src/operation.rs index eabc1ab..11eaf17 100644 --- a/keystore2/src/operation.rs +++ b/keystore2/src/operation.rs
@@ -290,7 +290,7 @@ // We abort the operation. If there was an error we log it but ignore it. if let Err(e) = map_km_error(self.km_op.abort()) { - log::error!("In prune: KeyMint::abort failed with {:?}.", e); + log::warn!("In prune: KeyMint::abort failed with {:?}.", e); } Ok(())