tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Replace use of deprecated logging functions" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-02-01 17:36:36 +00:00 committed by Gerrit Code Review
commit 17aa36a60d
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bluetooth/lmp_event/aidl/default/src/main.rs
View file

@ -21,7 +21,7 @@ use android_hardware_bluetooth_lmp_event::aidl::android::hardware::bluetooth::lm
}; };
use binder::BinderFeatures; use binder::BinderFeatures;
use log::{info, Level}; use log::{info, LevelFilter};
mod lmp_event; mod lmp_event;
@ -30,7 +30,7 @@ const LOG_TAG: &str = "lmp_event_service_example";
fn main() { fn main() {
info!("{LOG_TAG}: starting service"); info!("{LOG_TAG}: starting service");
let logger_success = logger::init( let logger_success = logger::init(
logger::Config::default().with_tag_on_device(LOG_TAG).with_min_level(Level::Trace) logger::Config::default().with_tag_on_device(LOG_TAG).with_max_level(LevelFilter::Trace)
); );
if !logger_success { if !logger_success {
panic!("{LOG_TAG}: Failed to start logger"); panic!("{LOG_TAG}: Failed to start logger");

4
security/authgraph/default/src/main.rs
View file

@ -50,8 +50,8 @@ fn inner_main() -> Result<(), HalServiceError> {
android_logger::init_once( android_logger::init_once(
android_logger::Config::default() android_logger::Config::default()
.with_tag("authgraph-hal-nonsecure") .with_tag("authgraph-hal-nonsecure")
.with_min_level(log::Level::Info) .with_max_level(log::LevelFilter::Info)
.with_log_id(android_logger::LogId::System), .with_log_buffer(android_logger::LogId::System),
); );
// Redirect panic messages to logcat. // Redirect panic messages to logcat.
std::panic::set_hook(Box::new(|panic_info| { std::panic::set_hook(Box::new(|panic_info| {

6
security/secretkeeper/default/src/main.rs
View file

@ -16,7 +16,7 @@
//! Non-secure implementation of the Secretkeeper HAL. //! Non-secure implementation of the Secretkeeper HAL.
use log::{error, info, Level}; use log::{error, info, LevelFilter};
use secretkeeper_hal::SecretkeeperService; use secretkeeper_hal::SecretkeeperService;
use secretkeeper_nonsecure::{AuthGraphChannel, SecretkeeperChannel, LocalTa}; use secretkeeper_nonsecure::{AuthGraphChannel, SecretkeeperChannel, LocalTa};
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
@ -29,8 +29,8 @@ fn main() {
android_logger::init_once( android_logger::init_once(
android_logger::Config::default() android_logger::Config::default()
.with_tag("NonSecureSecretkeeper") .with_tag("NonSecureSecretkeeper")
.with_min_level(Level::Info) .with_max_level(LevelFilter::Info)
.with_log_id(android_logger::LogId::System), .with_log_buffer(android_logger::LogId::System),
); );
// Redirect panic messages to logcat. // Redirect panic messages to logcat.
std::panic::set_hook(Box::new(|panic_info| { std::panic::set_hook(Box::new(|panic_info| {

4
uwb/aidl/default/src/service.rs
View file

@ -6,7 +6,7 @@ use tokio::runtime::Runtime;
use std::env; use std::env;
use std::panic; use std::panic;
use log::Level; use log::LevelFilter;
mod uwb; mod uwb;
mod uwb_chip; mod uwb_chip;
@ -14,7 +14,7 @@ mod uwb_chip;
fn main() -> anyhow::Result<()> { fn main() -> anyhow::Result<()> {
logger::init( logger::init(
logger::Config::default() logger::Config::default()
.with_min_level(Level::Debug) .with_max_level(LevelFilter::Debug)
.with_tag_on_device("android.hardware.uwb"), .with_tag_on_device("android.hardware.uwb"),
); );