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/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();
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()?;
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)?;
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.
diff --git a/encryptedstore/src/main.rs b/encryptedstore/src/main.rs
index dcb1cba..983e3e9 100644
--- a/encryptedstore/src/main.rs
+++ b/encryptedstore/src/main.rs
@@ -37,7 +37,7 @@
android_logger::init_once(
android_logger::Config::default()
.with_tag("encryptedstore")
- .with_min_level(log::Level::Info),
+ .with_max_level(log::LevelFilter::Info),
);
if let Err(e) = try_main() {
diff --git a/microdroid_manager/src/main.rs b/microdroid_manager/src/main.rs
index 8888feb..16607c2 100644
--- a/microdroid_manager/src/main.rs
+++ b/microdroid_manager/src/main.rs
@@ -171,7 +171,7 @@
android_logger::init_once(
android_logger::Config::default()
.with_tag("microdroid_manager")
- .with_min_level(log::Level::Info),
+ .with_max_level(log::LevelFilter::Info),
);
info!("started.");
diff --git a/virtualizationmanager/src/main.rs b/virtualizationmanager/src/main.rs
index f058547..01c74f5 100644
--- a/virtualizationmanager/src/main.rs
+++ b/virtualizationmanager/src/main.rs
@@ -27,7 +27,7 @@
use anyhow::{bail, Context, Result};
use binder::{BinderFeatures, ProcessState};
use lazy_static::lazy_static;
-use log::{info, Level};
+use log::{info, LevelFilter};
use rpcbinder::{FileDescriptorTransportMode, RpcServer};
use std::os::unix::io::{FromRawFd, OwnedFd, RawFd};
use clap::Parser;
@@ -107,8 +107,8 @@
android_logger::init_once(
android_logger::Config::default()
.with_tag(LOG_TAG)
- .with_min_level(Level::Info)
- .with_log_id(android_logger::LogId::System),
+ .with_max_level(LevelFilter::Info)
+ .with_log_buffer(android_logger::LogId::System),
);
check_vm_support().unwrap();
diff --git a/virtualizationservice/src/main.rs b/virtualizationservice/src/main.rs
index ea073bf..ad21e89 100644
--- a/virtualizationservice/src/main.rs
+++ b/virtualizationservice/src/main.rs
@@ -27,7 +27,7 @@
use android_system_virtualizationservice_internal::aidl::android::system::virtualizationservice_internal::IVirtualizationServiceInternal::BnVirtualizationServiceInternal;
use anyhow::Error;
use binder::{register_lazy_service, BinderFeatures, ProcessState, ThreadState};
-use log::{info, Level};
+use log::{info, LevelFilter};
use std::fs::{create_dir, read_dir};
use std::os::unix::raw::{pid_t, uid_t};
use std::path::Path;
@@ -48,8 +48,8 @@
android_logger::init_once(
Config::default()
.with_tag(LOG_TAG)
- .with_min_level(Level::Info)
- .with_log_id(android_logger::LogId::System)
+ .with_max_level(LevelFilter::Info)
+ .with_log_buffer(android_logger::LogId::System)
.with_filter(
// Reduce logspam by silencing logs from the disk crate which don't provide much
// information to us.
diff --git a/virtualizationservice/vfio_handler/src/main.rs b/virtualizationservice/vfio_handler/src/main.rs
index 1a1cce8..318d134 100644
--- a/virtualizationservice/vfio_handler/src/main.rs
+++ b/virtualizationservice/vfio_handler/src/main.rs
@@ -24,7 +24,7 @@
IVfioHandler,
};
use binder::{register_lazy_service, BinderFeatures, ProcessState};
-use log::{info, Level};
+use log::{info, LevelFilter};
const LOG_TAG: &str = "VfioHandler";
@@ -32,8 +32,8 @@
android_logger::init_once(
Config::default()
.with_tag(LOG_TAG)
- .with_min_level(Level::Info)
- .with_log_id(android_logger::LogId::System),
+ .with_max_level(LevelFilter::Info)
+ .with_log_buffer(android_logger::LogId::System),
);
let service = VfioHandler::init();
diff --git a/vm_payload/src/api.rs b/vm_payload/src/api.rs
index c76f2d3..7978059 100644
--- a/vm_payload/src/api.rs
+++ b/vm_payload/src/api.rs
@@ -24,7 +24,7 @@
Strong, ExceptionCode,
};
use lazy_static::lazy_static;
-use log::{error, info, Level};
+use log::{error, info, LevelFilter};
use rpcbinder::{RpcServer, RpcSession};
use openssl::{ec::EcKey, sha::sha256, ecdsa::EcdsaSig};
use std::convert::Infallible;
@@ -67,7 +67,7 @@
/// Make sure our logging goes to logcat. It is harmless to call this more than once.
fn initialize_logging() {
android_logger::init_once(
- android_logger::Config::default().with_tag("vm_payload").with_min_level(Level::Info),
+ android_logger::Config::default().with_tag("vm_payload").with_max_level(LevelFilter::Info),
);
}