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: I39532792c2efd8a20a25da23004bc335d6c8ad7f
diff --git a/compos/composd/src/composd_main.rs b/compos/composd/src/composd_main.rs
index 9f6ce9c..e5d6c75 100644
--- a/compos/composd/src/composd_main.rs
+++ b/compos/composd/src/composd_main.rs
@@ -34,9 +34,9 @@
#[allow(clippy::eq_op)]
fn try_main() -> Result<()> {
let debuggable = env!("TARGET_BUILD_VARIANT") != "user";
- let log_level = if debuggable { log::Level::Debug } else { log::Level::Info };
+ let log_level = if debuggable { log::LevelFilter::Debug } else { log::LevelFilter::Info };
android_logger::init_once(
- android_logger::Config::default().with_tag("composd").with_min_level(log_level),
+ android_logger::Config::default().with_tag("composd").with_max_level(log_level),
);
// Redirect panic messages to logcat.
diff --git a/compos/src/compsvc_main.rs b/compos/src/compsvc_main.rs
index 128d581..06cc599 100644
--- a/compos/src/compsvc_main.rs
+++ b/compos/src/compsvc_main.rs
@@ -40,7 +40,9 @@
fn try_main() -> Result<()> {
android_logger::init_once(
- android_logger::Config::default().with_tag("compsvc").with_min_level(log::Level::Debug),
+ android_logger::Config::default()
+ .with_tag("compsvc")
+ .with_max_level(log::LevelFilter::Debug),
);
// Redirect panic messages to logcat.
panic::set_hook(Box::new(|panic_info| {
diff --git a/compos/verify/verify.rs b/compos/verify/verify.rs
index 952e9c7..567083d 100644
--- a/compos/verify/verify.rs
+++ b/compos/verify/verify.rs
@@ -60,8 +60,8 @@
android_logger::init_once(
android_logger::Config::default()
.with_tag("compos_verify")
- .with_min_level(log::Level::Info)
- .with_log_id(LogId::System), // Needed to log successfully early in boot
+ .with_max_level(log::LevelFilter::Info)
+ .with_log_buffer(LogId::System), // Needed to log successfully early in boot
);
// Redirect panic messages to logcat.