| commit | 153d1aaff4939f7fd9f39b95177c8fe836dd912d | [log] [tgz] |
|---|---|---|
| author | Jeff Vander Stoep <jeffv@google.com> | Wed Feb 07 14:33:36 2024 +0100 |
| committer | Jeff Vander Stoep <jeffv@google.com> | Wed Feb 07 14:33:36 2024 +0100 |
| tree | 95bcff52e74dddab3dd2e22c8e3511b2b819ed08 | |
| parent | b7e542168822061f58065c641a4d3955568e381e [diff] |
Replace use of deprecated logging functions This is needed to upgrade the android_logger crate from 0.12.0 to 0.13.3. with_max_level provides the same functionality as with_min_level. The renaming is admittedly confusing, but the new name is accurate and it makes sense that they deprecated and then removed the previously poorly named with_min_level. See crate documentation [1] and code [2]. [1]: https://docs.rs/android_logger/0.12.0/android_logger/struct.Config.html#method.with_min_level [2]: https://docs.rs/android_logger/0.12.0/src/android_logger/lib.rs.html#227 Bug: 322718401 Test: build and run CF with the change. Test: m aosp_cf_x86_64_phone Change-Id: Ibd13989ffe52a93191dd2d5a1b8f5a651eecd91d
diff --git a/keystore2/selinux/src/concurrency_test.rs b/keystore2/selinux/src/concurrency_test.rs index a5d2df2..fa97f3a 100644 --- a/keystore2/selinux/src/concurrency_test.rs +++ b/keystore2/selinux/src/concurrency_test.rs
@@ -69,7 +69,7 @@ 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 32fdb59..695e029 100644 --- a/keystore2/selinux/src/lib.rs +++ b/keystore2/selinux/src/lib.rs
@@ -720,7 +720,7 @@ 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()?;