Merge "Replace use of deprecated logging functions" into main am: 5b9f6b70d2 am: eb58a7f2a0

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2952890

Change-Id: I3a7ae5af2bf905c3cc1e0b9ba69705b4b499509c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-02-07 17:29:14 +00:00 committed by Automerger Merge Worker
commit b6486ef636
4 changed files with 4 additions and 4 deletions

View file

@ -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();

View file

@ -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()?;

View file

@ -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.

View file

@ -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());