commit 5336020be353118d15f2cd26383d9e2e631b7a2d
author Steven Moreland <smoreland@google.com> Tue Aug 31 16:47:14 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 31 16:47:14 2021 +0000
tree 610e031e29aea19bc0c7da03e5d2485e7903f49c
parent 58fe4fe69eac027ce2d8bb2e0d4f7a4f05a521d3
parent 538558e2a95f6325e48ebb64630e42e75140609f

Merge "android.security.*: use versions for imports"

keystore2/src/async_task.rs

diff --git a/keystore2/src/async_task.rs b/keystore2/src/async_task.rs
index e130024..0515c8f 100644
--- a/keystore2/src/async_task.rs
+++ b/keystore2/src/async_task.rs
@@ -417,7 +417,9 @@
             Err(RecvTimeoutError::Timeout)
         );
         done_receiver.recv().unwrap();
-        idle_done_receiver.recv_timeout(Duration::from_millis(1)).unwrap();
+        // Now that the last low-priority job has completed, the idle task should
+        // fire pretty much immediately.
+        idle_done_receiver.recv_timeout(Duration::from_millis(50)).unwrap();
 
         // Idle callback not executed again even if we wait for a while.
         assert_eq!(
@@ -438,7 +440,7 @@
             Err(RecvTimeoutError::Timeout)
         );
         done_receiver.recv().unwrap();
-        idle_done_receiver.recv_timeout(Duration::from_millis(1)).unwrap();
+        idle_done_receiver.recv_timeout(Duration::from_millis(50)).unwrap();
     }
 
     #[test]