commit 221428587700d4459e8bf5d2a0a272804a51bb97
author David Drysdale <drysdale@google.com> Tue Jul 23 10:14:21 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 23 10:14:21 2024 +0000
tree 244f81c4fc6bcbd7374f16450cec1af404425233
parent 6d4af63dc7cee859c50aceb5656158ac53f2f650
parent 1da59bc10d3d92be34fa08259cd2f992cd8ca2ae

Merge "Remove the database_loop_timeout flag" into main

keystore2/aconfig/flags.aconfig

diff --git a/keystore2/aconfig/flags.aconfig b/keystore2/aconfig/flags.aconfig
index 65f0857..05dae46 100644
--- a/keystore2/aconfig/flags.aconfig
+++ b/keystore2/aconfig/flags.aconfig
@@ -32,11 +32,3 @@
   bug: "283077822"
   is_fixed_read_only: true
 }
-
-flag {
-  name: "database_loop_timeout"
-  namespace: "hardware_backed_security"
-  description: "Abandon Keystore database retry loop after an interval"
-  bug: "319563050"
-  is_fixed_read_only: true
-}
\ No newline at end of file