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>
This commit is contained in:
commit
eb58a7f2a0
4 changed files with 4 additions and 4 deletions
|
@ -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();
|
||||
|
|
|
@ -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()?;
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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());
|
||||
|
|
Loading…
Reference in a new issue