Merge "Replace use of deprecated function with_min_level" into main (372c4f4d) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/rust/common/src/logging.rs

+13 −17

Original line number	Diff line number	Diff line
		@@ -3,16 +3,16 @@ use crate::init_flags::{
		LOG_TAG_NOTICE, LOG_TAG_VERBOSE, LOG_TAG_WARN,
		};

		fn get_log_level() -> log::Level {
		fn get_log_level() -> log::LevelFilter {
		match get_log_level_for_tag("bluetooth_core") {
		LOG_TAG_FATAL => log::Level::Error,
		LOG_TAG_ERROR => log::Level::Error,
		LOG_TAG_WARN => log::Level::Warn,
		LOG_TAG_NOTICE => log::Level::Info,
		LOG_TAG_INFO => log::Level::Info,
		LOG_TAG_DEBUG => log::Level::Debug,
		LOG_TAG_VERBOSE => log::Level::Trace,
		_ => log::Level::Info, // default level
		LOG_TAG_FATAL => log::LevelFilter::Error,
		LOG_TAG_ERROR => log::LevelFilter::Error,
		LOG_TAG_WARN => log::LevelFilter::Warn,
		LOG_TAG_NOTICE => log::LevelFilter::Info,
		LOG_TAG_INFO => log::LevelFilter::Info,
		LOG_TAG_DEBUG => log::LevelFilter::Debug,
		LOG_TAG_VERBOSE => log::LevelFilter::Trace,
		_ => log::LevelFilter::Info, // default level
		}
		}

		@@ -20,18 +20,14 @@ fn get_log_level() -> log::Level {
		#[cfg(target_os = "android")]
		pub fn init_logging() {
		android_logger::init_once(
		android_logger::Config::default().with_tag("bt").with_min_level(get_log_level()),
		android_logger::Config::default().with_tag("bt").with_max_level(get_log_level()),
		);
		log::set_max_level(get_log_level().to_level_filter())
		log::set_max_level(get_log_level())
		}

		/// Inits logging for host
		#[cfg(not(target_os = "android"))]
		pub fn init_logging() {
		env_logger::Builder::new()
		.filter(None, get_log_level().to_level_filter())
		.parse_default_env()
		.try_init()
		.ok();
		log::set_max_level(get_log_level().to_level_filter())
		env_logger::Builder::new().filter(None, get_log_level()).parse_default_env().try_init().ok();
		log::set_max_level(get_log_level())
		}