commit 40b6a8f0c613c0275af59a7b3a4a6d096ff81201
author Jeffrey Vander Stoep <jeffv@google.com> Tue Feb 06 16:09:30 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 06 16:09:30 2024 +0000
tree dba651174eeabb500aa1258255fd35d10bec8801
parent 161b80bd02c0ff226b6f2f6ab14f12a821a40a76
parent 56aedd555188e618db420a1e150fe37624a61b0f

Merge "Replace use of deprecated logging functions" into main

trusty/keymint/src/keymint_hal_main.rs

diff --git a/trusty/keymint/src/keymint_hal_main.rs b/trusty/keymint/src/keymint_hal_main.rs
index cfa859f..eda986a 100644
--- a/trusty/keymint/src/keymint_hal_main.rs
+++ b/trusty/keymint/src/keymint_hal_main.rs
@@ -92,8 +92,8 @@
     android_logger::init_once(
         android_logger::Config::default()
             .with_tag("keymint-hal-trusty")
-            .with_min_level(log::Level::Info)
-            .with_log_id(android_logger::LogId::System),
+            .with_max_level(log::LevelFilter::Info)
+            .with_log_buffer(android_logger::LogId::System),
     );
     // Redirect panic messages to logcat.
     panic::set_hook(Box::new(|panic_info| {

trusty/secretkeeper/src/hal_main.rs

diff --git a/trusty/secretkeeper/src/hal_main.rs b/trusty/secretkeeper/src/hal_main.rs
index 1dc697d..df30493 100644
--- a/trusty/secretkeeper/src/hal_main.rs
+++ b/trusty/secretkeeper/src/hal_main.rs
@@ -101,8 +101,8 @@
     android_logger::init_once(
         android_logger::Config::default()
             .with_tag("secretkeeper-hal-trusty")
-            .with_min_level(log::Level::Info)
-            .with_log_id(android_logger::LogId::System),
+            .with_max_level(log::LevelFilter::Info)
+            .with_log_buffer(android_logger::LogId::System),
     );
     // Redirect panic messages to logcat.
     panic::set_hook(Box::new(|panic_info| {