| commit | cbf5879ccfa8890d71bd8a4bdf81a5ed62e2069a | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Tue Jul 23 11:16:03 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 23 11:16:03 2024 +0000 |
| tree | 6759b8081d294f5906b2e213504e29f2e5dfecdc | |
| parent | 8ed780a955c04822ce5078e5b30ea091dfdbbf48 [diff] | |
| parent | 4144e22c3f82f0b42f663a150d191b5da4e9c635 [diff] |
Merge "Remove the database_loop_timeout flag" into main am: 2214285877 am: 4144e22c3f Original change: https://android-review.googlesource.com/c/platform/system/security/+/3165863 Change-Id: I8980137afa3a0c2a4230aed41fd4a9461a99de9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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