commit 57da15778ede838674bade9a5f3c7252827eca0d
author Jeff Vander Stoep <jeffv@google.com> Wed Jan 31 10:52:16 2024 +0100
committer Jeff Vander Stoep <jeffv@google.com> Wed Jan 31 10:53:48 2024 +0100
tree 273dd1d17dee8af74613a8cfa49c14711d48bd77
parent 1ec249c4961434e5d10ca4871a4ab6e3f2fa2bd4

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

authfs/fd_server/src/main.rs

diff --git a/authfs/fd_server/src/main.rs b/authfs/fd_server/src/main.rs
index 47983cb..26315bf 100644
--- a/authfs/fd_server/src/main.rs
+++ b/authfs/fd_server/src/main.rs
@@ -123,7 +123,9 @@
 
 fn main() -> Result<()> {
     android_logger::init_once(
-        android_logger::Config::default().with_tag("fd_server").with_min_level(log::Level::Debug),
+        android_logger::Config::default()
+            .with_tag("fd_server")
+            .with_max_level(log::LevelFilter::Debug),
     );
 
     let args = Args::parse();

authfs/service/src/main.rs

diff --git a/authfs/service/src/main.rs b/authfs/service/src/main.rs
index 67e22a5..97e684d 100644
--- a/authfs/service/src/main.rs
+++ b/authfs/service/src/main.rs
@@ -130,9 +130,9 @@
 #[allow(clippy::eq_op)]
 fn try_main() -> Result<()> {
     let debuggable = env!("TARGET_BUILD_VARIANT") != "user";
-    let log_level = if debuggable { log::Level::Trace } else { log::Level::Info };
+    let log_level = if debuggable { log::LevelFilter::Trace } else { log::LevelFilter::Info };
     android_logger::init_once(
-        android_logger::Config::default().with_tag("authfs_service").with_min_level(log_level),
+        android_logger::Config::default().with_tag("authfs_service").with_max_level(log_level),
     );
 
     clean_up_working_directory()?;

authfs/src/main.rs

diff --git a/authfs/src/main.rs b/authfs/src/main.rs
index e14b771..e46b197 100644
--- a/authfs/src/main.rs
+++ b/authfs/src/main.rs
@@ -293,9 +293,9 @@
 fn try_main() -> Result<()> {
     let args = Args::parse();
 
-    let log_level = if args.debug { log::Level::Debug } else { log::Level::Info };
+    let log_level = if args.debug { log::LevelFilter::Debug } else { log::LevelFilter::Info };
     android_logger::init_once(
-        android_logger::Config::default().with_tag("authfs").with_min_level(log_level),
+        android_logger::Config::default().with_tag("authfs").with_max_level(log_level),
     );
 
     let service = file::get_rpc_binder_service(args.cid)?;