commit | d0b337dd25aaa63949f11cdfda3028f7319db5df | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Apr 02 17:40:05 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 02 17:40:05 2024 +0000 |
tree | 96f7c9f7c7a3ae1a6475a2f6c7f72549854143e5 | |
parent | 8bbb97b268bc4c9ab744452cf538d815477a7b6f [diff] | |
parent | 3acb6db524b3a19989ac809c83ad4ee0ada1d032 [diff] |
Merge "Update needed for Rust v1.77.1" into main am: 3acb6db524 Original change: https://android-review.googlesource.com/c/platform/system/security/+/3023123 Change-Id: I298e11815f22bcfccaca9b4894699325f1cd0170 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/keystore2/src/database.rs b/keystore2/src/database.rs index 113c049..dd64764 100644 --- a/keystore2/src/database.rs +++ b/keystore2/src/database.rs
@@ -5019,7 +5019,7 @@ // This allows us to test repeated elements. thread_local! { - static RANDOM_COUNTER: RefCell<i64> = RefCell::new(0); + static RANDOM_COUNTER: RefCell<i64> = const { RefCell::new(0) }; } fn reset_random() {