Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b59cd24a authored by Jeff Vander Stoep's avatar Jeff Vander Stoep Committed by Automerger Merge Worker
Browse files

Remove use of deprecated function with_min_level am: 616ec0e4 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2931850



Change-Id: I650b90288c2e124163e9c95a2eb8d7c908ea8525
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d67ebf23 616ec0e4

doh/ffi.rs

+5 −7
Original line number Original line Diff line number Diff line
@@ -122,8 +122,8 @@ pub const DOH_LOG_LEVEL_TRACE: u32 = 4; 




const DOH_PORT: u16 = 443;

const DOH_PORT: u16 = 443;





fn level_from_u32(level: u32) -> Option<log::Level> {

fn level_from_u32(level: u32) -> Option<log::LevelFilter> {

    use log::Level::*;

    use log::LevelFilter::*;

    match level {

    match level {

        DOH_LOG_LEVEL_ERROR => Some(Error),

        DOH_LOG_LEVEL_ERROR => Some(Error),

        DOH_LOG_LEVEL_WARN => Some(Warn),

        DOH_LOG_LEVEL_WARN => Some(Warn),
@@ -139,17 +139,15 @@ fn level_from_u32(level: u32) -> Option<log::Level> { 
/// If called more than once, it will have no effect on subsequent calls.

/// If called more than once, it will have no effect on subsequent calls.

#[no_mangle]

#[no_mangle]

pub extern "C" fn doh_init_logger(level: u32) {

pub extern "C" fn doh_init_logger(level: u32) {

    let log_level = level_from_u32(level).unwrap_or(log::Level::Error);

    let log_level = level_from_u32(level).unwrap_or(log::LevelFilter::Error);

    android_logger::init_once(android_logger::Config::default().with_min_level(log_level));

    android_logger::init_once(android_logger::Config::default().with_max_level(log_level));

}

}





/// Set the log level.

/// Set the log level.

/// If an invalid level is passed, defaults to logging errors only.

/// If an invalid level is passed, defaults to logging errors only.

#[no_mangle]

#[no_mangle]

pub extern "C" fn doh_set_log_level(level: u32) {

pub extern "C" fn doh_set_log_level(level: u32) {

    let level_filter = level_from_u32(level)

    let level_filter = level_from_u32(level).unwrap_or(log::LevelFilter::Error);

        .map(|level| level.to_level_filter())

        .unwrap_or(log::LevelFilter::Error);

    log::set_max_level(level_filter);

    log::set_max_level(level_filter);

}

}

doh/tests/doh_frontend/src/ffi.rs

+3 −1
Original line number Original line Diff line number Diff line
@@ -198,7 +198,9 @@ pub extern "C" fn frontend_stats_clear_queries(doh: &DohFrontend) -> bool { 
#[no_mangle]

#[no_mangle]

pub extern "C" fn init_android_logger() {

pub extern "C" fn init_android_logger() {

    android_logger::init_once(

    android_logger::init_once(

        android_logger::Config::default().with_tag("DohFrontend").with_min_level(log::Level::Debug),

        android_logger::Config::default()

            .with_tag("DohFrontend")

            .with_max_level(log::LevelFilter::Debug),

    );

    );

}

}