summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaquille Johnson <ssjohnson@google.com>2024-02-17 20:17:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-02-17 20:17:17 +0000
commitc81370b5cca0204a65206b80b55b05860f465551 (patch)
treeb125b570986ad6efe409c5e4d3054a9f68174148
parent1ce40098c8fd2a2b61a725f6083ac23ac065c30b (diff)
parentea9fe60bf5b50849da397f7b5c95072bdbe0c521 (diff)
downloadsecurity-c81370b5cca0204a65206b80b55b05860f465551.tar.gz
Merge "Update typo and add blob id to log" into main am: ea9fe60bf5
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2960905 Change-Id: I017b7d478829aa746655f55a45db899616571f97 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--keystore2/src/database.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/keystore2/src/database.rs b/keystore2/src/database.rs
index d320e20a..b526daac 100644
--- a/keystore2/src/database.rs
+++ b/keystore2/src/database.rs
@@ -1167,9 +1167,9 @@ impl KeystoreDB {
"DELETE FROM persistent.blobmetadata WHERE blobentryid = ?;",
params![blob_id],
)
- .context("Trying to delete blob metadata.")?;
+ .context(ks_err!("Trying to delete blob metadata: {:?}", blob_id))?;
tx.execute("DELETE FROM persistent.blobentry WHERE id = ?;", params![blob_id])
- .context("Trying to blob.")?;
+ .context(ks_err!("Trying to delete blob: {:?}", blob_id))?;
}
Self::cleanup_unreferenced(tx).context("Trying to cleanup unreferenced.")?;