commit 2bd70bf11fd0bff042616d59e32f3532b7875c10
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 11 19:35:41 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 11 19:35:41 2021 +0000
tree f4fe6cb9ae4fd73d3be248e428af77fb211717d9
parent 7708000c11b2c6ffbbbd7b170b5b54ba544dbbdc
parent 2ef77d36748dfb62f60f12b953ea6417a783e651

Merge "Keystore 2.0: Reinstate the default busy handler."

keystore2/src/database.rs

diff --git a/keystore2/src/database.rs b/keystore2/src/database.rs
index 5801a0c..ce0cb1d 100644
--- a/keystore2/src/database.rs
+++ b/keystore2/src/database.rs
@@ -2380,11 +2380,12 @@
                 let mut stmt = tx
                     .prepare(
                         "SELECT keyentryid, access_vector FROM persistent.grant
-                            WHERE grantee = ? AND id = ?;",
+                            WHERE grantee = ? AND id = ? AND
+                            (SELECT state FROM persistent.keyentry WHERE id = keyentryid) = ?;",
                     )
                     .context("Domain::GRANT prepare statement failed")?;
                 let mut rows = stmt
-                    .query(params![caller_uid as i64, key.nspace])
+                    .query(params![caller_uid as i64, key.nspace, KeyLifeCycle::Live])
                     .context("Domain:Grant: query failed.")?;
                 let (key_id, access_vector): (i64, i32) =
                     db_utils::with_rows_extract_one(&mut rows, |row| {