diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-02-07 16:47:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-07 16:47:42 +0000 |
| commit | eb58a7f2a03e84ec5db4212e4953b8d4ece37cd5 (patch) | |
| tree | 95bcff52e74dddab3dd2e22c8e3511b2b819ed08 | |
| parent | c7f9449a28f5ebff3932bc3a01b690d59434315d (diff) | |
| parent | 5b9f6b70d2fc528e4e27d38f49cb69c9716972a8 (diff) | |
| download | security-eb58a7f2a03e84ec5db4212e4953b8d4ece37cd5.tar.gz | |
Merge "Replace use of deprecated logging functions" into main am: 5b9f6b70d2
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2952890
Change-Id: Idf0918f9b8830a9d6c9a0e18fd8a7c635f8fab85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | keystore2/selinux/src/concurrency_test.rs | 2 | ||||
| -rw-r--r-- | keystore2/selinux/src/lib.rs | 2 | ||||
| -rw-r--r-- | keystore2/src/error.rs | 2 | ||||
| -rw-r--r-- | keystore2/watchdog/src/lib.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/keystore2/selinux/src/concurrency_test.rs b/keystore2/selinux/src/concurrency_test.rs index a5d2df2c..fa97f3aa 100644 --- a/keystore2/selinux/src/concurrency_test.rs +++ b/keystore2/selinux/src/concurrency_test.rs @@ -69,7 +69,7 @@ fn test_concurrent_check_access() { android_logger::init_once( android_logger::Config::default() .with_tag("keystore2_selinux_concurrency_test") - .with_min_level(log::Level::Debug), + .with_max_level(log::LevelFilter::Debug), ); let cpus = num_cpus::get(); diff --git a/keystore2/selinux/src/lib.rs b/keystore2/selinux/src/lib.rs index 32fdb594..695e0291 100644 --- a/keystore2/selinux/src/lib.rs +++ b/keystore2/selinux/src/lib.rs @@ -720,7 +720,7 @@ mod tests { android_logger::init_once( android_logger::Config::default() .with_tag("keystore_selinux_tests") - .with_min_level(log::Level::Debug), + .with_max_level(log::LevelFilter::Debug), ); let scontext = Context::new("u:r:shell:s0")?; let backend = KeystoreKeyBackend::new()?; diff --git a/keystore2/src/error.rs b/keystore2/src/error.rs index b4c57fbd..f0d0d27b 100644 --- a/keystore2/src/error.rs +++ b/keystore2/src/error.rs @@ -352,7 +352,7 @@ pub mod tests { android_logger::init_once( android_logger::Config::default() .with_tag("keystore_error_tests") - .with_min_level(log::Level::Debug), + .with_max_level(log::LevelFilter::Debug), ); // All Error::Rc(x) get mapped on a service specific error // code of x. diff --git a/keystore2/watchdog/src/lib.rs b/keystore2/watchdog/src/lib.rs index 01043c55..fa4620a8 100644 --- a/keystore2/watchdog/src/lib.rs +++ b/keystore2/watchdog/src/lib.rs @@ -335,7 +335,7 @@ mod tests { android_logger::init_once( android_logger::Config::default() .with_tag("keystore2_watchdog_tests") - .with_min_level(log::Level::Debug), + .with_max_level(log::LevelFilter::Debug), ); let wd = Watchdog::new(Watchdog::NOISY_REPORT_TIMEOUT.checked_mul(3).unwrap()); |